diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix index 51db35bede69..90b9491039c4 100644 --- a/nixos/tests/kea.nix +++ b/nixos/tests/kea.nix @@ -223,6 +223,7 @@ import ./make-test-python.nix ( '' start_all() router.wait_for_unit("kea-dhcp4-server.service") + client.systemctl("start systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service") client.wait_until_succeeds("ping -c 5 10.0.0.1") router.wait_until_succeeds("ping -c 5 10.0.0.3") diff --git a/nixos/tests/systemd-bpf.nix b/nixos/tests/systemd-bpf.nix index 2820218b2286..bc51d08497de 100644 --- a/nixos/tests/systemd-bpf.nix +++ b/nixos/tests/systemd-bpf.nix @@ -39,7 +39,9 @@ import ./make-test-python.nix ( testScript = '' start_all() + node1.systemctl("start systemd-networkd-wait-online.service") node1.wait_for_unit("systemd-networkd-wait-online.service") + node2.systemctl("start systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online.service") with subtest("test RestrictNetworkInterfaces= works"): diff --git a/nixos/tests/systemd-networkd-bridge.nix b/nixos/tests/systemd-networkd-bridge.nix index 1c21cc113167..ec0547ce5cc4 100644 --- a/nixos/tests/systemd-networkd-bridge.nix +++ b/nixos/tests/systemd-networkd-bridge.nix @@ -131,6 +131,7 @@ import ./make-test-python.nix ( start_all() for n in network_nodes + network_switches: + n.systemctl("start systemd-networkd-wait-online.service") n.wait_for_unit("systemd-networkd-wait-online.service") node1.succeed("ping 10.0.0.2 -w 10 -c 1") diff --git a/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix b/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix index 4604b28caf91..512925eb9f5b 100644 --- a/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix +++ b/nixos/tests/systemd-networkd-dhcpserver-static-leases.nix @@ -73,6 +73,7 @@ import ./make-test-python.nix ( start_all() with subtest("check router network configuration"): + router.systemctl("start systemd-networkd-wait-online.service") router.wait_for_unit("systemd-networkd-wait-online.service") eth1_status = router.succeed("networkctl status eth1") assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \ @@ -80,6 +81,7 @@ import ./make-test-python.nix ( assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4" with subtest("check client network configuration"): + client.systemctl("start systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service") eth1_status = client.succeed("networkctl status eth1") assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \ diff --git a/nixos/tests/systemd-networkd.nix b/nixos/tests/systemd-networkd.nix index 2923967cc897..44ea52435c7b 100644 --- a/nixos/tests/systemd-networkd.nix +++ b/nixos/tests/systemd-networkd.nix @@ -96,10 +96,12 @@ in import ./make-test-python.nix ({pkgs, ... }: { }; testScript = '' start_all() - node1.succeed("systemctl start systemd-networkd-wait-online@eth1.service") + node1.systemctl("start systemd-networkd-wait-online@eth1.service") + node1.systemctl("start systemd-networkd-wait-online.service") node1.wait_for_unit("systemd-networkd-wait-online@eth1.service") node1.wait_for_unit("systemd-networkd-wait-online.service") - node2.succeed("systemctl start systemd-networkd-wait-online@eth1.service") + node2.systemctl("start systemd-networkd-wait-online@eth1.service") + node2.systemctl("start systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online@eth1.service") node2.wait_for_unit("systemd-networkd-wait-online.service")