From a3a441cd870e29ec63b41b3fbedb9ccd9c81a69a Mon Sep 17 00:00:00 2001
From: Linus Heckemann <git@sphalerite.org>
Date: Tue, 8 Oct 2019 17:09:05 +0200
Subject: [PATCH] nixos/tests/{ferm,networking}: fix eval with networkd

The networking.virtual test does not work with networkd yet, for
multiple reasons:

- network-online.target is not reached, because tun0 and tap0 are
  considered as required for online but _not_ brought up or assigned
  the configured addresses
- the commands later in the test rely on some units from the scripted
  network setup

cc @fpletz networkd exper
cc @globin we looked at this together
---
 nixos/tests/ferm.nix       | 1 +
 nixos/tests/networking.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 14c1cd44f5c..edf9c8036ac 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -23,6 +23,7 @@ import ./make-test.nix ({ pkgs, ...} : {
           networking = {
             dhcpcd.enable = false;
             useNetworkd = true;
+            useDHCP = false;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::1"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.1"; prefixLength = 24; } ];
           };
diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index f12a5fc9ae5..e0585d8f1bb 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -450,6 +450,7 @@ let
       name = "Virtual";
       machine = {
         networking.useNetworkd = networkd;
+        networking.useDHCP = false;
         networking.interfaces.tap0 = {
           ipv4.addresses = [ { address = "192.168.1.1"; prefixLength = 24; } ];
           ipv6.addresses = [ { address = "2001:1470:fffd:2096::"; prefixLength = 64; } ];