aboutsummaryrefslogtreecommitdiff
path: root/gnu/tests/base.scm
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2017-10-01 19:59:55 +0300
committerEfraim Flashner <efraim@flashner.co.il>2017-10-01 22:16:22 +0300
commit64df08f0cfac8f7a329002afa3461fd62a4b229c (patch)
tree019909423138ceb49cdd86f1af48d366503db68f /gnu/tests/base.scm
parentb83ad3ace56c65a367e8f58c7b78323cf251b94b (diff)
parent0ef1c223071869488c35b72b7407234c11425589 (diff)
downloadguix-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar
guix-64df08f0cfac8f7a329002afa3461fd62a4b229c.tar.gz
Merge remote-tracking branch 'origin/master' into core-updates
Diffstat (limited to 'gnu/tests/base.scm')
-rw-r--r--gnu/tests/base.scm23
1 files changed, 6 insertions, 17 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index 5b40d4514a..1bc7a70277 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -250,19 +250,8 @@ info --version")
;; It can take a while before the shell commands are executed.
(marionette-eval '(use-modules (rnrs io ports)) marionette)
- (marionette-eval
- '(let loop ((i 0))
- (catch 'system-error
- (lambda ()
- (call-with-input-file "/root/logged-in"
- get-string-all))
- (lambda args
- (if (and (< i 15) (= ENOENT (system-error-errno args)))
- (begin
- (sleep 1)
- (loop (+ i 1)))
- (apply throw args)))))
- marionette)))
+ (wait-for-file "/root/logged-in" marionette
+ #:read 'get-string-all)))
;; There should be one utmpx entry for the user logged in on tty1.
(test-equal "utmpx entry"
@@ -555,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)))))