diff options
Diffstat (limited to 'gnu/tests/base.scm')
| -rw-r--r-- | gnu/tests/base.scm | 34 |
1 files changed, 13 insertions, 21 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index 9429a10b75..9198a3e267 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -94,9 +94,7 @@ Otherwise assume that there is no password for root." (define marionette (make-marionette #$command)) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "basic") #$(and initialization @@ -486,10 +484,11 @@ info --version") (test-assert "screendump" (begin - (marionette-control (string-append "screendump " #$output - "/tty1.ppm") - marionette) - (file-exists? "tty1.ppm"))) + (let ((capture + (string-append #$output "/tty1.ppm"))) + (marionette-control + (string-append "screendump " capture) marionette) + (file-exists? capture)))) (test-assert "screen text" (let ((text (marionette-screen-text marionette @@ -505,8 +504,7 @@ info --version") "root@" #$(operating-system-host-name os)))))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation name test)) @@ -642,9 +640,7 @@ in a loop. See <http://bugs.gnu.org/26931>.") (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "cleanup") (test-assert "dirty service worked" @@ -657,8 +653,7 @@ in a loop. See <http://bugs.gnu.org/26931>.") (scandir "/tmp")) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "cleanup" test)) @@ -713,9 +708,7 @@ non-ASCII names from /tmp.") (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "mcron") (test-assert "service running" @@ -752,8 +745,7 @@ non-ASCII names from /tmp.") result) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation name test)) @@ -824,6 +816,7 @@ non-ASCII names from /tmp.") (mkdir #$output) (chdir #$output) + (test-runner-current (system-test-runner)) (test-begin "avahi") (test-assert "nscd PID file is created" @@ -902,8 +895,7 @@ non-ASCII names from /tmp.") (= (hostent:addrtype result) AF_INET))))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "nss-mdns" test)) |