From 8aaa5cf40539b3634be744700bbe246c69c8ddbf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 14 May 2023 22:35:30 +0200 Subject: tests: dhcpd: Avoid race conditions. Those tests were racy: it could take a while for those files to appear and for the shepherd service to be up. Thus, wait a little longer for each of them. * gnu/tests/networking.scm (run-dhcpd-test)["pid file exists"] ["lease file exists"]: Use 'wait-for-file'. ["dhcpd is alive"]: Use 'wait-for-service'. --- gnu/tests/networking.scm | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm index a8358c6a55..a192c7e655 100644 --- a/gnu/tests/networking.scm +++ b/gnu/tests/networking.scm @@ -412,8 +412,6 @@ (define test (with-imported-modules '((gnu build marionette)) #~(begin (use-modules (gnu build marionette) - (ice-9 popen) - (ice-9 rdelim) (srfi srfi-64)) (define marionette @@ -423,16 +421,15 @@ (define marionette (test-begin "dhcpd") (test-assert "pid file exists" - (marionette-eval - '(file-exists? - #$(dhcpd-configuration-pid-file dhcpd-v4-configuration)) + (wait-for-file + '#$(dhcpd-configuration-pid-file dhcpd-v4-configuration) marionette)) (test-assert "lease file exists" - (marionette-eval - '(file-exists? - #$(dhcpd-configuration-lease-file dhcpd-v4-configuration)) - marionette)) + (wait-for-file + '#$(dhcpd-configuration-lease-file dhcpd-v4-configuration) + marionette + #:read '(@ (ice-9 textual-ports) get-string-all))) (test-assert "run directory exists" (marionette-eval @@ -443,13 +440,8 @@ (define marionette (test-assert "dhcpd is alive" (marionette-eval '(begin - (use-modules (gnu services herd) - (srfi srfi-1)) - (live-service-running - (find (lambda (live) - (memq 'dhcpv4-daemon - (live-service-provision live))) - (current-services)))) + (use-modules (gnu services herd)) + (wait-for-service 'dhcpv4-daemon)) marionette)) (test-end)))) -- cgit v1.2.3