From 5a555642179c5aa39849b9fbc03d7d0253e16d5c Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 8 May 2016 23:49:02 +0200 Subject: 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'. --- gnu/tests/base.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/tests') 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 @@ (define marionette "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. -- cgit v1.2.3