colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixosTests.networking.virtual: fix with networkd

Browse Source 
We only need to wait for network.target to get up, and the
network-addresses-${interfaceName} units are scripted networking only.
This commit is contained in:
Florian Klink 2020-04-13 19:15:08 +02:00
parent 1e1945319c
commit 5150378c2f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/tests/networking.nix
View File

@ -471,7 +471,7 @@ let
with subtest("Wait for networking to come up"): with subtest("Wait for networking to come up"):
machine.start() machine.start()
machine.wait_for_unit("network-online.target") machine.wait_for_unit("network.target")
with subtest("Test interfaces set up"): with subtest("Test interfaces set up"):
list = machine.succeed("ip tuntap list | sort").strip() list = machine.succeed("ip tuntap list | sort").strip()
@ -486,7 +486,8 @@ let
""".format( """.format(
list, targetList list, targetList
) )
'' # network-addresses-* only exist in scripted networking
+ optionalString (!networkd) ''
with subtest("Test interfaces clean up"): with subtest("Test interfaces clean up"):
machine.succeed("systemctl stop network-addresses-tap0") machine.succeed("systemctl stop network-addresses-tap0")
machine.sleep(10) machine.sleep(10)