diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-05-08 23:49:02 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-05-08 23:49:44 +0200 |
| commit | 5a555642179c5aa39849b9fbc03d7d0253e16d5c (patch) | |
| tree | 4a0411d56a7fb36e215a06746a7c4b89b4ec3526 | |
| parent | b8785cb944ac51c30672b7293c09311bffbb5308 (diff) | |
| download | patches-5a555642179c5aa39849b9fbc03d7d0253e16d5c.tar patches-5a555642179c5aa39849b9fbc03d7d0253e16d5c.tar.gz | |
system: tests: Use 'start-service' to wait for service.
* gnu/tests/base.scm (%test-basic-os): Use 'start-service' instead of a
busy loop to wait for 'term-tty1'.
| -rw-r--r-- | gnu/tests/base.scm | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/gnu/tests/base.scm b/gnu/tests/base.scm index bf2d095709..0f19449508 100644 --- a/gnu/tests/base.scm +++ b/gnu/tests/base.scm @@ -128,17 +128,13 @@ info --version") "root\n" (begin (marionette-control "sendkey ctrl-alt-f1" marionette) - ;; Wait for the 'term-tty1' service to be running + ;; Wait for the 'term-tty1' service to be running (using + ;; 'start-service' is the simplest and most reliable way to do + ;; that.) (marionette-eval '(begin (use-modules (gnu services herd)) - - (let loop ((i 0)) - (when (> i 10) - (error "terminal service not running" (current-services))) - (unless (memq 'term-tty1 (current-services)) - (sleep 1) - (loop (+ i 1))))) + (start-service 'term-tty1)) marionette) ;; Now we can type. |