guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch master updated: tests: install: Fix marionette race condition.


From: guix-commits
Subject: branch master updated: tests: install: Fix marionette race condition.
Date: Fri, 26 Jun 2020 08:49:49 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 1da6914  tests: install: Fix marionette race condition.
1da6914 is described below

commit 1da6914589e06621a78ce0ed13f707cc767c2a3d
Author: Mathieu Othacehe <othacehe@gnu.org>
AuthorDate: Fri Jun 26 14:44:12 2020 +0200

    tests: install: Fix marionette race condition.
    
    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.
---
 gnu/tests/install.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index db355b8..3323f8c 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -301,7 +301,8 @@ packages defined in installation-os."
               ;; Run SCRIPT.  It typically invokes 'reboot' as a last step and
               ;; thus normally gets killed with SIGTERM by PID 1.
               (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)))))
 
             (when #$(->bool gui-test)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]