summaryrefslogtreecommitdiff
path: root/gnu/tests/docker.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-13 16:29:21 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-12-13 16:29:21 -0500
commit6dffced09ecda024e0884e352778c221ad066fd6 (patch)
tree1707e8d8df4d9c47317a39ab6abbfc2ca66a6c29 /gnu/tests/docker.scm
parentb603554ed044638dd40b6863d5dada59eefe03b8 (diff)
parente3196755e60ba7f1ed9d432e73f26a85e0c8893c (diff)
Merge branch 'core-updates-frozen' into 'master'.
At last!
Diffstat (limited to 'gnu/tests/docker.scm')
-rw-r--r--gnu/tests/docker.scm14
1 files changed, 4 insertions, 10 deletions
diff --git a/gnu/tests/docker.scm b/gnu/tests/docker.scm
index 92611b0a8d..bc119988b7 100644
--- a/gnu/tests/docker.scm
+++ b/gnu/tests/docker.scm
@@ -76,9 +76,7 @@ inside %DOCKER-OS."
(define marionette
(make-marionette (list #$vm)))
- (mkdir #$output)
- (chdir #$output)
-
+ (test-runner-current (system-test-runner #$output))
(test-begin "docker")
(test-assert "service running"
@@ -143,8 +141,7 @@ inside %DOCKER-OS."
(string->number response4))))
marionette))
- (test-end)
- (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+ (test-end))))
(gexp->derivation "docker-test" test))
@@ -221,9 +218,7 @@ inside %DOCKER-OS."
(define marionette
(make-marionette (list #$vm)))
- (mkdir #$output)
- (chdir #$output)
-
+ (test-runner-current (system-test-runner #$output))
(test-begin "docker")
(test-assert "service running"
@@ -288,8 +283,7 @@ inside %DOCKER-OS."
"status" "guix-daemon")))
marionette))
- (test-end)
- (exit (= (test-runner-fail-count (test-runner-current)) 0)))))
+ (test-end))))
(gexp->derivation "docker-system-test" test))