summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2023-05-11 11:04:50 +0200
committerLudovic Courtès <ludo@gnu.org>2023-05-11 13:21:45 +0200
commitb2a65b4c8cfe06eb48e0db83a408dd84175e07dc (patch)
treedb342e90402f3949fc036bd072708c10101ac09d
parent695042ff108f57fa190852f3fe1f06b2b1f6c967 (diff)
tests: openvswitch: Wait for 'openvswitch-configuration' to be up.
Checking for "br0" should only be done once the 'openvswitch-configuration' service is up because it's the one that sets it up. * gnu/tests/networking.scm (run-openvswitch-test)["openvswitch-configuration is running"]: New test.
-rw-r--r--gnu/tests/networking.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/tests/networking.scm b/gnu/tests/networking.scm
index 3f3f653b8a4..a8358c6a555 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -4,7 +4,7 @@
4;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com> 4;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
5;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> 5;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
6;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be> 6;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
7;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org> 7;;; Copyright © 2021, 2023 Ludovic Courtès <ludo@gnu.org>
8;;; 8;;;
9;;; This file is part of GNU Guix. 9;;; This file is part of GNU Guix.
10;;; 10;;;
@@ -300,6 +300,14 @@ port 7, and a dict service on port 2628."
300 (test-runner-current (system-test-runner #$output)) 300 (test-runner-current (system-test-runner #$output))
301 (test-begin "openvswitch") 301 (test-begin "openvswitch")
302 302
303 ;; Wait for our configuration to be active (it sets up br0).
304 (test-assert "openvswitch-configuration is running"
305 (marionette-eval
306 '(begin
307 (use-modules (gnu services herd))
308 (wait-for-service 'openvswitch-configuration))
309 marionette))
310
303 ;; Make sure the bridge is created. 311 ;; Make sure the bridge is created.
304 (test-assert "br0 exists" 312 (test-assert "br0 exists"
305 (marionette-eval 313 (marionette-eval