futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: install: Fix marionette race condition.

Browse Source 
If the marionette shuts down before the script return is received, then status
will be <eof>.

* gnu/tests/install.scm (run-install): Allow status to be the <eof> object.
This commit is contained in:
Mathieu Othacehe 2020-06-26 14:44:12 +02:00
parent eca649d06b
commit 1da6914589
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gnu/tests/install.scm
View File

@ -301,7 +301,8 @@ packages defined in installation-os."
;; Run SCRIPT. It typically invokes 'reboot' as a last step and ;; Run SCRIPT. It typically invokes 'reboot' as a last step and
;; thus normally gets killed with SIGTERM by PID 1. ;; thus normally gets killed with SIGTERM by PID 1.
(let ((status (marionette-eval '(system #$script) marionette))) (let ((status (marionette-eval '(system #$script) marionette)))
(exit (or (equal? (status:term-sig status) SIGTERM) (exit (or (eof-object? status)
(equal? (status:term-sig status) SIGTERM)
(equal? (status:exit-val status) 0))))) (equal? (status:exit-val status) 0)))))
(when #$(->bool gui-test) (when #$(->bool gui-test)