diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
| commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
| tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/tests/nfs.scm | |
| parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
| parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) | |
| download | guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar guix-patches-18af6870370226b4d502d7372844e7f2aded5887.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/tests/nfs.scm')
| -rw-r--r-- | gnu/tests/nfs.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gnu/tests/nfs.scm b/gnu/tests/nfs.scm index 00109b752e..5e4de2783b 100644 --- a/gnu/tests/nfs.scm +++ b/gnu/tests/nfs.scm @@ -236,7 +236,7 @@ (use-modules (gnu services herd)) (start-service 'nfs)) marionette) - (wait-for-file "/var/run/rpc.statd.pid"))) + (wait-for-file "/var/run/rpc.statd.pid" marionette))) (test-assert "nfs share is advertised" (marionette-eval |