diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-08-30 17:59:15 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-08-31 15:44:19 +0200 |
| commit | 183605c8533ad321ff8bba209b64071a9e84714a (patch) | |
| tree | acf1fd1ac0e496f7dd7d69a006e1859f6bdad1fa /gnu/tests | |
| parent | 1bc4d0c26634163413a8ec12c627367ca5c1bbba (diff) | |
| download | patches-183605c8533ad321ff8bba209b64071a9e84714a.tar patches-183605c8533ad321ff8bba209b64071a9e84714a.tar.gz | |
services: herd: Provide <live-service> objects.
* gnu/services/herd.scm (<live-service>): New record type.
(current-services): Change to return a single value: #f or a list of
<live-service>.
* guix/scripts/system.scm (call-with-service-upgrade-info): Adjust
accordingly.
* gnu/tests/base.scm (run-basic-test)["shepherd services"]: Adjust
accordingly.
Diffstat (limited to 'gnu/tests')
| -rw-r--r-- | gnu/tests/base.scm | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index ca6f76c0f8..41f50c0e7a 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -122,11 +122,13 @@ info --version") (operating-system-user-accounts os)))))) (test-assert "shepherd services" - (let ((services (marionette-eval '(begin - (use-modules (gnu services herd)) - (call-with-values current-services - append)) - marionette))) + (let ((services (marionette-eval + '(begin + (use-modules (gnu services herd)) + + (map (compose car live-service-provision) + (current-services))) + marionette))) (lset= eq? (pk 'services services) '(root #$@(operating-system-shepherd-service-names os))))) |