summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-09-26 10:09:53 +0200
committerLudovic Courtès <ludo@gnu.org>2017-09-26 10:09:53 +0200
commit077f1e6384fbd28ffd02e9e10a413bb3c24aaa15 (patch)
treec0730bc1d2f3fd90186ab6a6ac4a0027148d9307
parenta95ddf0d0747bd3742a682fcce39a86c181e6312 (diff)
downloadguix-077f1e6384fbd28ffd02e9e10a413bb3c24aaa15.tar.gz
tests: mcron: Adjust use of 'wait-for-file'.
Fixes a regression introduced in
8bd5231485cdeb02078c4294badb3a1e7caa0fe0, whereby returning #<eof> would
no longer work (since #<eof> would be in the cdr of the result, and thus
it would not get converted to a string.)

* gnu/tests/base.scm (run-mcron-test)["root's job with command"]: Pass
  #:read to 'wait-for-file'.
-rw-r--r--gnu/tests/base.scm8
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 959da31a60..1bc7a70277 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -544,11 +544,11 @@ in a loop.  See <http://bugs.gnu.org/26931>.")
                (>= gid 100))))
 
           ;; Last, the job that uses a command; allows us to test whether
-          ;; $PATH is sane.  (Note that 'marionette-eval' stringifies objects
-          ;; that don't have a read syntax, hence the string.)
+          ;; $PATH is sane.
           (test-equal "root's job with command"
-            "#<eof>"
-            (wait-for-file "/root/witness-touch" marionette))
+            ""
+            (wait-for-file "/root/witness-touch" marionette
+                           #:read '(@ (ice-9 rdelim) read-string)))
 
           (test-end)
           (exit (= (test-runner-fail-count (test-runner-current)) 0)))))