Skip to content

Commit

Permalink
nixosTests.networking.virtual: fix with networkd
Browse files Browse the repository at this point in the history
We only need to wait for network.target to get up, and the
network-addresses-${interfaceName} units are scripted networking only.

(cherry picked from commit a501abd5499d8f82f0991a7b78bcbc4169b0537f)
ZHF: #80379
Fix a failing test.
  • Loading branch information
flokli authored and rnhmjoj committed Apr 14, 2020
1 parent 3add50e commit 897182c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions nixos/tests/networking.nix
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ let
with subtest("Wait for networking to come up"):
machine.start()
machine.wait_for_unit("network-online.target")
machine.wait_for_unit("network.target")
with subtest("Test interfaces set up"):
list = machine.succeed("ip tuntap list | sort").strip()
Expand All @@ -486,7 +486,7 @@ let
""".format(
list, targetList
)
'' + optionalString (!networkd) ''
with subtest("Test interfaces clean up"):
machine.succeed("systemctl stop network-addresses-tap0")
machine.sleep(10)
Expand Down

0 comments on commit 897182c

Please sign in to comment.