From 897182cdaf580f238a5660aef7d70827480aa7a2 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Mon, 13 Apr 2020 19:15:08 +0200 Subject: [PATCH] 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. (cherry picked from commit a501abd5499d8f82f0991a7b78bcbc4169b0537f) ZHF: #80379 Fix a failing test. --- nixos/tests/networking.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index 0a6507d2dc884..fd6a60fa9f35f 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,7 @@ let """.format( list, targetList ) - + '' + optionalString (!networkd) '' with subtest("Test interfaces clean up"): machine.succeed("systemctl stop network-addresses-tap0") machine.sleep(10)