diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-09-26 23:20:56 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-26 23:20:56 +0200 |
| commit | 89b05442933d92f4b21c3294455a498e8333727d (patch) | |
| tree | a2a100da39651f1f19bd4c29be7a3d9a5167758a /gnu/tests/networking.scm | |
| parent | 7d728294481620e90f7b5e7a76e02e8032be578a (diff) | |
| download | guix-patches-89b05442933d92f4b21c3294455a498e8333727d.tar guix-patches-89b05442933d92f4b21c3294455a498e8333727d.tar.gz | |
tests: Reduce boilerplate for users of 'system-test-runner'.
* gnu/tests/audio.scm, gnu/tests/base.scm, gnu/tests/ci.scm,
gnu/tests/cups.scm, gnu/tests/databases.scm, gnu/tests/desktop.scm,
gnu/tests/dict.scm, gnu/tests/docker.scm, gnu/tests/file-sharing.scm,
gnu/tests/ganeti.scm, gnu/tests/guix.scm, gnu/tests/ldap.scm,
gnu/tests/linux-modules.scm,
gnu/tests/mail.scm, gnu/tests/messaging.scm, gnu/tests/monitoring.scm,
gnu/tests/networking.scm, gnu/tests/nfs.scm,
gnu/tests/package-management.scm, gnu/tests/reconfigure.scm,
gnu/tests/rsync.scm, gnu/tests/security-token.scm,
gnu/tests/singularity.scm, gnu/tests/ssh.scm, gnu/tests/telephony.scm,
gnu/tests/version-control.scm, gnu/tests/virtualization.scm,
gnu/tests/web.scm: Remove (mkdir #$output) (chdir #$output) and
pass #$output as argument to 'system-test-runner'.
Diffstat (limited to 'gnu/tests/networking.scm')
| -rw-r--r-- | gnu/tests/networking.scm | 30 |
1 files changed, 6 insertions, 24 deletions
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index fc2060b3ec..cebba7c7ca 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -104,10 +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)) + (test-runner-current (system-test-runner #$output)) (test-begin "inetd") ;; Make sure the PID file is created. @@ -204,10 +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)) + (test-runner-current (system-test-runner #$output)) (test-begin "openvswitch") ;; Make sure the bridge is created. @@ -304,10 +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)) + (test-runner-current (system-test-runner #$output)) (test-begin "dhcpd") (test-assert "pid file exists" @@ -399,10 +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)) + (test-runner-current (system-test-runner #$output)) (test-begin "tor") ;; Test the usual Tor service. @@ -526,10 +514,7 @@ COMMIT (loop (read-line in))))))))) marionette)) - (mkdir #$output) - (chdir #$output) - - (test-runner-current (system-test-runner)) + (test-runner-current (system-test-runner #$output)) (test-begin "iptables") (test-equal "iptables-save dumps the same rules that were loaded" @@ -622,10 +607,7 @@ COMMIT marionette)) (marionette-eval '(use-modules (guix ipfs)) marionette) - (mkdir #$output) - (chdir #$output) - - (test-runner-current (system-test-runner)) + (test-runner-current (system-test-runner #$output)) (test-begin "ipfs") ;; Test the IPFS service. |