mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 03:40:34 +02:00
Code Activity

Use mkdtemp to simplify repl server test

Browse source 
* test-suite/tests/00-repl-server.test (make-tempdir): removed
  (call-with-repl-server): use mkdtemp instead of make-tempdir
This commit is contained in:
Michael Gran 2021-01-21 10:41:10 -08:00
parent 32bf48e4b7
commit 1a6eaba436
1 changed files with 6 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

24
test-suite/tests/00-repl-server.test
View file

@ -1,6 +1,6 @@
;;;; 00-repl-server.test --- REPL server. -*- mode: scheme; coding: utf-8; -*- ;;;; 00-repl-server.test --- REPL server. -*- mode: scheme; coding: utf-8; -*-
;;;; ;;;;
;;;; Copyright (C) 2016, 2017 Free Software Foundation, Inc. ;;;; Copyright (C) 2016, 2017, 2021 Free Software Foundation, Inc.
;;;; ;;;;
;;;; This library is free software; you can redistribute it and/or ;;;; This library is free software; you can redistribute it and/or
;;;; modify it under the terms of the GNU Lesser General Public ;;;; modify it under the terms of the GNU Lesser General Public
@ -24,30 +24,18 @@
#:use-module (web request) #:use-module (web request)
#:use-module (test-suite lib)) #:use-module (test-suite lib))
;; FIXME: replace with mkdtemp! (or equivalent) when available
(define (make-tempdir)
(let loop ((try 0)
(n (random:uniform)))
(let* ((path (string-append "/tmp/repl-server-test-" (number->string n)))
(dir (false-if-exception (mkdir path #o700))))
(cond
(dir path)
((> try 10)
(error "Unable to create directory in /tmp for 00-repl-server.test"))
(else (loop (1+ try) (random:uniform)))))))
(define (call-with-repl-server proc) (define (call-with-repl-server proc)
"Set up a REPL server in a separate process and call PROC with a "Set up a REPL server in a separate process and call PROC with a
socket connected to that server." socket connected to that server."
(let* ((tmpdir (make-tempdir)) ;; The REPL server requires thread. The test requires fork.
(unless (and (provided? 'threads) (provided? 'fork) (defined? 'mkdtemp))
(throw 'unsupported))
(let* ((tmpdir (mkdtemp "/tmp/repl-server-test-XXXXXX"))
(sockaddr (make-socket-address AF_UNIX (string-append tmpdir "/repl-server"))) (sockaddr (make-socket-address AF_UNIX (string-append tmpdir "/repl-server")))
(client-socket (socket AF_UNIX SOCK_STREAM 0))) (client-socket (socket AF_UNIX SOCK_STREAM 0)))
(false-if-exception (delete-file (sockaddr:path sockaddr))) (false-if-exception (delete-file (sockaddr:path sockaddr)))
;; The REPL server requires thread. The test requires fork.
(unless (and (provided? 'threads) (provided? 'fork))
(throw 'unsupported))
(match (primitive-fork) (match (primitive-fork)
(0 (0
(dynamic-wind (dynamic-wind