diff options
Diffstat (limited to 'gnu/tests/networking.scm')
| -rw-r--r-- | gnu/tests/networking.scm | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index 453e63f52d..cebba7c7ca 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -104,9 +104,7 @@ port 7, and a dict service on port 2628." (define marionette (make-marionette (list #$vm))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "inetd") ;; Make sure the PID file is created. @@ -137,8 +135,7 @@ port 7, and a dict service on port 2628." (close dict) response))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "inetd-test" test)) @@ -204,9 +201,7 @@ port 7, and a dict service on port 2628." (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "openvswitch") ;; Make sure the bridge is created. @@ -244,8 +239,7 @@ port 7, and a dict service on port 2628." (current-services)))) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "openvswitch-test" test)) @@ -304,9 +298,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (define marionette (make-marionette (list #$(virtual-machine os)))) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "dhcpd") (test-assert "pid file exists" @@ -339,8 +331,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (current-services)))) marionette)) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "dhcpd-test" test)) @@ -399,9 +390,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (current-services)))) marionette)) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "tor") ;; Test the usual Tor service. @@ -433,8 +422,7 @@ subnet 192.168.1.0 netmask 255.255.255.0 { (wait-for-unix-socket "/var/run/tor/socks-sock" marionette/unix-socks-socket))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "tor-test" test)) @@ -526,9 +514,7 @@ COMMIT (loop (read-line in))))))))) marionette)) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "iptables") (test-equal "iptables-save dumps the same rules that were loaded" @@ -557,8 +543,7 @@ COMMIT ;; marionette) ;; (wait-for-tcp-port inetd-echo-port marionette #:timeout 5))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "iptables" test)) @@ -622,9 +607,7 @@ COMMIT marionette)) (marionette-eval '(use-modules (guix ipfs)) marionette) - (mkdir #$output) - (chdir #$output) - + (test-runner-current (system-test-runner #$output)) (test-begin "ipfs") ;; Test the IPFS service. @@ -644,8 +627,7 @@ COMMIT test-bv (read-contents (add-data test-bv))) - (test-end) - (exit (= (test-runner-fail-count (test-runner-current)) 0))))) + (test-end)))) (gexp->derivation "ipfs-test" test)) (define %test-ipfs |