aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-09-27 23:58:05 +0200
committerLudovic Courtès <ludo@gnu.org>2018-09-27 23:58:05 +0200
commit7fed9353ece5974ff431fa666a530da237a12085 (patch)
tree0d02050727639028bb608b6103d4521adb9aaf5e /tests
parentd4e9317b9de29f77eb8559bd99e0e2fe20d5f1fe (diff)
downloadguix-7fed9353ece5974ff431fa666a530da237a12085.tar.gz
guix-7fed9353ece5974ff431fa666a530da237a12085.zip
tests: Adjust services tests to new 'shepherd-service-upgrade'.
This is a followup to 4245ddcbc9f935804c17c97872b90ec1050c2d75. * tests/services.scm ("shepherd-service-upgrade: one unchanged, one upgraded, one new") ("shepherd-service-upgrade: service depended on is not unloaded") ("shepherd-service-upgrade: obsolete services that depend on each other"): Adjust to changes in 'shepherd-service-upgrade'.
Diffstat (limited to 'tests')
-rw-r--r--tests/services.scm30
1 files changed, 16 insertions, 14 deletions
diff --git a/tests/services.scm b/tests/services.scm
index 1ad577e601..5827dee80d 100644
--- a/tests/services.scm
+++ b/tests/services.scm
@@ -207,13 +207,14 @@
list))
(test-equal "shepherd-service-upgrade: one unchanged, one upgraded, one new"
- '(((bar)) ;unload
- ((bar) (baz))) ;load
+ '(() ;unload
+ ((foo))) ;restart
(call-with-values
(lambda ()
- ;; Here 'foo' is not upgraded because it is still running, whereas
- ;; 'bar' is upgraded because it is not currently running. 'baz' is
- ;; loaded because it's a new service.
+ ;; Here 'foo' is replaced and must be explicitly restarted later
+ ;; because it is still running, whereas 'bar' is upgraded right away
+ ;; because it is not currently running. 'baz' is loaded because it's
+ ;; a new service.
(shepherd-service-upgrade
(list (live-service '(foo) '() #t)
(live-service '(bar) '() #f)
@@ -224,30 +225,31 @@
(start #t))
(shepherd-service (provision '(baz))
(start #t)))))
- (lambda (unload load)
+ (lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision load)))))
+ (map shepherd-service-provision restart)))))
(test-equal "shepherd-service-upgrade: service depended on is not unloaded"
'(((baz)) ;unload
- ()) ;load
+ ((foo))) ;restart
(call-with-values
(lambda ()
;; Service 'bar' is not among the target services; yet, it must not be
- ;; unloaded because 'foo' depends on it.
+ ;; unloaded because 'foo' depends on it. 'foo' gets replaced but it
+ ;; must be restarted manually.
(shepherd-service-upgrade
(list (live-service '(foo) '(bar) #t)
(live-service '(bar) '() #t) ;still used!
(live-service '(baz) '() #t))
(list (shepherd-service (provision '(foo))
(start #t)))))
- (lambda (unload load)
+ (lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision load)))))
+ (map shepherd-service-provision restart)))))
(test-equal "shepherd-service-upgrade: obsolete services that depend on each other"
'(((foo) (bar) (baz)) ;unload
- ((qux))) ;load
+ ()) ;restart
(call-with-values
(lambda ()
;; 'foo', 'bar', and 'baz' depend on each other, but all of them are
@@ -258,9 +260,9 @@
(live-service '(baz) '() #t)) ;obsolete
(list (shepherd-service (provision '(qux))
(start #t)))))
- (lambda (unload load)
+ (lambda (unload restart)
(list (map live-service-provision unload)
- (map shepherd-service-provision load)))))
+ (map shepherd-service-provision restart)))))
(test-eq "lookup-service-types"
system-service-type