rekahsoft
/
guix
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

reconfigure: Don't call build-derivations for upgrade-services test 

This commit adjusts the upgrade-services system test to not build anything
when computing the derivation for the system test.  I came across this when
looking at issues computing the system test derivations to store in the Guix
Data Service.

* gnu/tests/reconfigure.scm (run-upgrade-services-test): Remove the use of,
and definition for ensure-service-file.
This commit is contained in:
Christopher Baines 2020-04-07 22:10:40 +01:00
parent 928dc1bb1c
commit 53aa66c3df
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/tests/reconfigure.scm
View File

@ -136,14 +136,6 @@ Shepherd (PID 1) by unloading obsolete services and loading new services."
(stop #~(const #t))
(respawn? #f)))
;; Return the Shepherd service file for SERVICE, after ensuring that it
;; exists in the store.
(define (ensure-service-file service)
(let ((file (shepherd-service-file service)))
(mlet* %store-monad ((store-object (lower-object file))
(_ (built-derivations (list store-object))))
(return file))))
(define (test enable-dummy disable-dummy)
(with-imported-modules '((gnu build marionette))
#~(begin
@ -187,10 +179,12 @@ Shepherd (PID 1) by unloading obsolete services and loading new services."
(test-end)
(exit (= (test-runner-fail-count (test-runner-current)) 0)))))
(mlet* %store-monad ((file (ensure-service-file dummy-service)))
(let ((enable (upgrade-services-program (list file) '(dummy) '() '()))
(gexp->derivation
"upgrade-services"
(let* ((file (shepherd-service-file dummy-service))
(enable (upgrade-services-program (list file) '(dummy) '() '()))
(disable (upgrade-services-program '() '() '(dummy) '())))
(gexp->derivation "upgrade-services" (test enable disable)))))
(test enable disable))))
(define* (run-install-bootloader-test)
"Run a test of an OS running INSTALL-BOOTLOADER-PROGRAM, which installs a