Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 3add50e56db4
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 897182cdaf58
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Apr 14, 2020

  1. 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.
    @flokli @rnhmjoj
    flokli authored and rnhmjoj committed Apr 14, 2020
    Copy the full SHA
    897182c View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/tests/networking.nix
4 changes: 2 additions & 2 deletions nixos/tests/networking.nix
View file
Original file line number Diff line number Diff line change
@@ -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)