diff options
author | Joachim F <joachifm@users.noreply.github.com> | 2016-10-02 16:34:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-02 16:34:37 +0200 |
commit | 0906a0f19718605a8074c1c1bf0b3368f8e0d09c (patch) | |
tree | 77d768b4693a4d5b05858609f22782c461c1b9bd /nixos/tests | |
parent | c2ee2a723f4d97de650e972e69c03acb5c2197da (diff) | |
parent | fc0dc65f416ccc3e5cc4acfca7aaf93b50890670 (diff) | |
download | nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.gz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.bz2 nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.lz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.xz nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.tar.zst nixlib-0906a0f19718605a8074c1c1bf0b3368f8e0d09c.zip |
Merge pull request #18491 from groxxda/network-interfaces
Replace Network-interfaces.target
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/networking.nix | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix index d5a0a9b798f5..17d4a878d3a4 100644 --- a/nixos/tests/networking.nix +++ b/nixos/tests/networking.nix @@ -41,7 +41,6 @@ let machine.networking.useNetworkd = networkd; testScript = '' startAll; - $machine->waitForUnit("network-interfaces.target"); $machine->waitForUnit("network.target"); $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '"); $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '"); @@ -71,9 +70,7 @@ let '' startAll; - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Make sure dhcpcd is not started @@ -119,9 +116,7 @@ let '' startAll; - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -164,9 +159,7 @@ let startAll; # Wait for networking to come up - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -213,9 +206,7 @@ let startAll; # Wait for networking to come up - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Test bonding @@ -259,11 +250,8 @@ let startAll; # Wait for networking to come up - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Test bridging @@ -298,9 +286,7 @@ let startAll; # Wait for networking to come up - $client->waitForUnit("network-interfaces.target"); $client->waitForUnit("network.target"); - $router->waitForUnit("network-interfaces.target"); $router->waitForUnit("network.target"); # Wait until we have an ip address on each interface @@ -348,9 +334,7 @@ let startAll; # Wait for networking to be configured - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Print diagnostic information @@ -391,9 +375,7 @@ let startAll; # Wait for networking to be configured - $client1->waitForUnit("network-interfaces.target"); $client1->waitForUnit("network.target"); - $client2->waitForUnit("network-interfaces.target"); $client2->waitForUnit("network.target"); # Test vlan is setup |