diff options
| author | Florian Klink <flokli@flokli.de> | 2020-04-13 19:15:08 +0200 |
|---|---|---|
| committer | Florian Klink <flokli@flokli.de> | 2020-04-13 22:03:35 +0200 |
| commit | 5150378c2f10d34a7ba4404c52f6c882284dd254 (patch) | |
| tree | 017c57398b7f4a844c58b60409a3e1b3a67560ab /nixos | |
| parent | 1e1945319c2017e0a40a2ea3023d64f282d2b538 (diff) | |
nixosTests.networking.virtual: fix with networkd
We only need to wait for network.target to get up, and the
network-addresses-${interfaceName} units are scripted networking only.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/networking.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 5c4aa5c38e11..5dde9046fc30 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -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() @@ -486,7 +486,8 @@ let """.format( list, targetList ) - + '' # network-addresses-* only exist in scripted networking + + optionalString (!networkd) '' with subtest("Test interfaces clean up"): machine.succeed("systemctl stop network-addresses-tap0") machine.sleep(10) |