nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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'.
This commit is contained in:
Ludovic Courtès 2016-06-20 21:39:23 +02:00
parent b0d388c9dc
commit 908935b512
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/tests/base.scm
View File

@ -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))))