summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2016-06-20 21:39:23 +0200
committerLudovic Courtès <ludo@gnu.org>2016-06-20 23:50:46 +0200
commit908935b512c1c22839eef201ff80d0bdef093962 (patch)
tree15770118ad7dd51c18e4809abe31f037c3ff2c4f /gnu
parentb0d388c9dc0d20c12e15bf9a4f1c292873701eee (diff)
tests: base: Fully honor the OS passed to 'run-basic-test'.
* gnu/tests/base.scm (run-basic-test)["uname"]: Use the host name of OS. ["shepherd services"]: Use service names from OS. (%test-basic-os): Add call to 'virtualized-operating-system'.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/tests/base.scm19
1 files changed, 12 insertions, 7 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm
index ee342ed827..b417bc4bda 100644
--- a/gnu/tests/base.scm
+++ b/gnu/tests/base.scm
@@ -79,10 +79,12 @@ properties of running system to what's declared in OS, an <operating-system>."
(test-assert "uname"
(match (marionette-eval '(uname) marionette)
- (#("Linux" "komputilo" version _ "x86_64")
- (string-prefix? #$(package-version
- (operating-system-kernel os))
- version))))
+ (#("Linux" host-name version _ "x86_64")
+ (and (string=? host-name
+ #$(operating-system-host-name os))
+ (string-prefix? #$(package-version
+ (operating-system-kernel os))
+ version)))))
(test-assert "shell and user commands"
;; Is everything in $PATH?
@@ -117,8 +119,7 @@ info --version")
marionette)))
(lset= eq?
(pk 'services services)
- '(root #$@(operating-system-shepherd-service-names
- (virtualized-operating-system os '()))))))
+ '(root #$@(operating-system-shepherd-service-names os)))))
(test-equal "login on tty1"
"root\n"
@@ -168,4 +169,8 @@ info --version")
(guix combinators))))
(run (system-qemu-image/shared-store-script
os #:graphic? #f)))
- (run-basic-test os #~(list #$run))))
+ ;; XXX: Add call to 'virtualized-operating-system' to get the exact same
+ ;; set of services as the OS produced by
+ ;; 'system-qemu-image/shared-store-script'.
+ (run-basic-test (virtualized-operating-system os '())
+ #~(list #$run))))