summaryrefslogtreecommitdiffstats
path: root/nixos/tests
diff options
context:
space:
mode:
authorLinus Heckemann <git@sphalerite.org>2019-10-08 17:09:05 +0200
committerLinus Heckemann <git@sphalerite.org>2019-10-08 17:14:26 +0200
commita3a441cd870e29ec63b41b3fbedb9ccd9c81a69a (patch)
tree14d9ae1161558ee3a5f009f0ba87664e11a254e2 /nixos/tests
parent5aa4b1994629ed0701b8b6d6e094da9d7d912721 (diff)
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
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/ferm.nix1
-rw-r--r--nixos/tests/networking.nix1
2 files changed, 2 insertions, 0 deletions
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 14c1cd44f5ce..edf9c8036aca 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 f12a5fc9ae57..e0585d8f1bb4 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; } ];