movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 03:23:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/tests: manualy start networkd-wait-online

Browse source 
Fix some tests that broke after 2370696d.
This commit is contained in:
rnhmjoj 2024-12-31 09:37:23 +01:00
parent 6ba05144a0
commit 3f7a10dc74
No known key found for this signature in database
GPG key ID: BFBAF4C975F76450
5 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/tests/kea.nix
View file

@ -223,6 +223,7 @@ import ./make-test-python.nix (
'' ''
start_all() start_all()
router.wait_for_unit("kea-dhcp4-server.service") 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_for_unit("systemd-networkd-wait-online.service")
client.wait_until_succeeds("ping -c 5 10.0.0.1") client.wait_until_succeeds("ping -c 5 10.0.0.1")
router.wait_until_succeeds("ping -c 5 10.0.0.3") router.wait_until_succeeds("ping -c 5 10.0.0.3")

2
nixos/tests/systemd-bpf.nix
View file

@ -39,7 +39,9 @@ import ./make-test-python.nix (
testScript = '' testScript = ''
start_all() start_all()
node1.systemctl("start systemd-networkd-wait-online.service")
node1.wait_for_unit("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") node2.wait_for_unit("systemd-networkd-wait-online.service")
with subtest("test RestrictNetworkInterfaces= works"): with subtest("test RestrictNetworkInterfaces= works"):

1
nixos/tests/systemd-networkd-bridge.nix
View file

@ -131,6 +131,7 @@ import ./make-test-python.nix (
start_all() start_all()
for n in network_nodes + network_switches: for n in network_nodes + network_switches:
n.systemctl("start systemd-networkd-wait-online.service")
n.wait_for_unit("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") node1.succeed("ping 10.0.0.2 -w 10 -c 1")

2
nixos/tests/systemd-networkd-dhcpserver-static-leases.nix
View file

@ -73,6 +73,7 @@ import ./make-test-python.nix (
start_all() start_all()
with subtest("check router network configuration"): with subtest("check router network configuration"):
router.systemctl("start systemd-networkd-wait-online.service")
router.wait_for_unit("systemd-networkd-wait-online.service") router.wait_for_unit("systemd-networkd-wait-online.service")
eth1_status = router.succeed("networkctl status eth1") eth1_status = router.succeed("networkctl status eth1")
assert "Network File: /etc/systemd/network/01-eth1.network" in eth1_status, \ 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" assert "10.0.0.1" in eth1_status, "Did not find expected router IPv4"
with subtest("check client network configuration"): with subtest("check client network configuration"):
client.systemctl("start systemd-networkd-wait-online.service")
client.wait_for_unit("systemd-networkd-wait-online.service") client.wait_for_unit("systemd-networkd-wait-online.service")
eth1_status = client.succeed("networkctl status eth1") eth1_status = client.succeed("networkctl status eth1")
assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \ assert "Network File: /etc/systemd/network/40-eth1.network" in eth1_status, \

6
nixos/tests/systemd-networkd.nix
View file

@ -96,10 +96,12 @@ in import ./make-test-python.nix ({pkgs, ... }: {
}; };
testScript = '' testScript = ''
start_all() 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@eth1.service")
node1.wait_for_unit("systemd-networkd-wait-online.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@eth1.service")
node2.wait_for_unit("systemd-networkd-wait-online.service") node2.wait_for_unit("systemd-networkd-wait-online.service")