Merge pull request #273273 from numinit/nebula-test-improvement

nixos/nebula: fix possibly flaky tests
NixOS · Dec 10, 2023 · d8c2a39 · d8c2a39
2 parents 64292b0 + ce5124d
commit d8c2a39
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/nixos/tests/nebula.nix b/nixos/tests/nebula.nix
@@ -144,6 +144,7 @@ in
 
     restartAndCheckNebula = name: ip: ''
       ${name}.systemctl("restart [email protected]")
+      ${name}.wait_for_unit("[email protected]")
       ${name}.succeed("ping -c5 ${ip}")
     '';
 
@@ -179,6 +180,8 @@ in
       ${nodeB}.succeed("iptables -I INPUT -s " + node_a + " -j DROP")
       ${nodeA}.systemctl("restart [email protected]")
       ${nodeB}.systemctl("restart [email protected]")
+      ${nodeA}.wait_for_unit("[email protected]")
+      ${nodeB}.wait_for_unit("[email protected]")
     '';
     allowTrafficBetween = nodeA: nodeB: ''
       node_a = ${getPublicIp nodeA}
@@ -187,6 +190,8 @@ in
       ${nodeB}.succeed("iptables -D INPUT -s " + node_a + " -j DROP")
       ${nodeA}.systemctl("restart [email protected]")
       ${nodeB}.systemctl("restart [email protected]")
+      ${nodeA}.wait_for_unit("[email protected]")
+      ${nodeB}.wait_for_unit("[email protected]")
     '';
   in ''
     # Create the certificate and sign the lighthouse's keys.