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

tests.networking: remove network-interfaces.target

Browse Source
This commit is contained in:
Alexander Ried 2016-09-13 11:04:16 +02:00
parent 85c36d1f7d
commit 60a9edbbeb
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
nixos/tests/networking.nix
View File

@ -41,7 +41,6 @@ let
machine.networking.useNetworkd = networkd; machine.networking.useNetworkd = networkd;
testScript = '' testScript = ''
startAll; startAll;
$machine->waitForUnit("network-interfaces.target");
$machine->waitForUnit("network.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 'inet 127.0.0.1/8 '");
$machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '"); $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
@ -71,9 +70,7 @@ let
'' ''
startAll; startAll;
$client->waitForUnit("network-interfaces.target");
$client->waitForUnit("network.target"); $client->waitForUnit("network.target");
$router->waitForUnit("network-interfaces.target");
$router->waitForUnit("network.target"); $router->waitForUnit("network.target");
# Make sure dhcpcd is not started # Make sure dhcpcd is not started
@ -119,9 +116,7 @@ let
'' ''
startAll; startAll;
$client->waitForUnit("network-interfaces.target");
$client->waitForUnit("network.target"); $client->waitForUnit("network.target");
$router->waitForUnit("network-interfaces.target");
$router->waitForUnit("network.target"); $router->waitForUnit("network.target");
# Wait until we have an ip address on each interface # Wait until we have an ip address on each interface
@ -164,9 +159,7 @@ let
startAll; startAll;
# Wait for networking to come up # Wait for networking to come up
$client->waitForUnit("network-interfaces.target");
$client->waitForUnit("network.target"); $client->waitForUnit("network.target");
$router->waitForUnit("network-interfaces.target");
$router->waitForUnit("network.target"); $router->waitForUnit("network.target");
# Wait until we have an ip address on each interface # Wait until we have an ip address on each interface
@ -213,9 +206,7 @@ let
startAll; startAll;
# Wait for networking to come up # Wait for networking to come up
$client1->waitForUnit("network-interfaces.target");
$client1->waitForUnit("network.target"); $client1->waitForUnit("network.target");
$client2->waitForUnit("network-interfaces.target");
$client2->waitForUnit("network.target"); $client2->waitForUnit("network.target");
# Test bonding # Test bonding
@ -259,11 +250,8 @@ let
startAll; startAll;
# Wait for networking to come up # Wait for networking to come up
$client1->waitForUnit("network-interfaces.target");
$client1->waitForUnit("network.target"); $client1->waitForUnit("network.target");
$client2->waitForUnit("network-interfaces.target");
$client2->waitForUnit("network.target"); $client2->waitForUnit("network.target");
$router->waitForUnit("network-interfaces.target");
$router->waitForUnit("network.target"); $router->waitForUnit("network.target");
# Test bridging # Test bridging
@ -298,9 +286,7 @@ let
startAll; startAll;
# Wait for networking to come up # Wait for networking to come up
$client->waitForUnit("network-interfaces.target");
$client->waitForUnit("network.target"); $client->waitForUnit("network.target");
$router->waitForUnit("network-interfaces.target");
$router->waitForUnit("network.target"); $router->waitForUnit("network.target");
# Wait until we have an ip address on each interface # Wait until we have an ip address on each interface
@ -348,9 +334,7 @@ let
startAll; startAll;
# Wait for networking to be configured # Wait for networking to be configured
$client1->waitForUnit("network-interfaces.target");
$client1->waitForUnit("network.target"); $client1->waitForUnit("network.target");
$client2->waitForUnit("network-interfaces.target");
$client2->waitForUnit("network.target"); $client2->waitForUnit("network.target");
# Print diagnostic information # Print diagnostic information
@ -391,9 +375,7 @@ let
startAll; startAll;
# Wait for networking to be configured # Wait for networking to be configured
$client1->waitForUnit("network-interfaces.target");
$client1->waitForUnit("network.target"); $client1->waitForUnit("network.target");
$client2->waitForUnit("network-interfaces.target");
$client2->waitForUnit("network.target"); $client2->waitForUnit("network.target");
# Test vlan is setup # Test vlan is setup