summary refs log tree commit diff
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)
downloadguix-b2a65b4c8cfe06eb48e0db83a408dd84175e07dc.tar.gz
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 3f3f653b8a..a8358c6a55 100644
--- a/gnu/tests/networking.scm
+++ b/gnu/tests/networking.scm
@@ -4,7 +4,7 @@
 ;;; Copyright © 2018 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
 ;;; Copyright © 2021 Maxime Devos <maximedevos@telenet.be>
-;;; Copyright © 2021 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2021, 2023 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -300,6 +300,14 @@ port 7, and a dict service on port 2628."
           (test-runner-current (system-test-runner #$output))
           (test-begin "openvswitch")
 
+          ;; Wait for our configuration to be active (it sets up br0).
+          (test-assert "openvswitch-configuration is running"
+            (marionette-eval
+             '(begin
+                (use-modules (gnu services herd))
+                (wait-for-service 'openvswitch-configuration))
+             marionette))
+
           ;; Make sure the bridge is created.
           (test-assert "br0 exists"
             (marionette-eval