summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorUli Baum <xeji@cat3.de>2018-09-21 01:17:41 +0200
committerUli Baum <xeji@cat3.de>2018-09-21 01:17:41 +0200
commit5e7b7b805aed412fad6939ad6829f3ff77f64a38 (patch)
tree9909ffc21479c0ef77bcf106da0f0241c5779ef3 /nixos/tests
parentfab901ddd3d034c53901c640d9787c0794d1bcad (diff)
downloadnixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar.gz
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar.bz2
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar.lz
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar.xz
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.tar.zst
nixpkgs-5e7b7b805aed412fad6939ad6829f3ff77f64a38.zip
nixos/tests/ferm: disable dhcpcd
The test failed in one run on Hydra, logs look like
dhcpcd changed ipv6 routing at just the wrong time.
Disable dhcpcd. It's not needed, the test uses static IPs anyway.
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/ferm.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/tests/ferm.nix b/nixos/tests/ferm.nix
index 24b74df85ad..b8e8663e3ad 100644
--- a/nixos/tests/ferm.nix
+++ b/nixos/tests/ferm.nix
@@ -11,6 +11,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         with pkgs.lib;
         {
           networking = {
+            dhcpcd.enable = false;
             interfaces.eth1.ipv6.addresses = mkOverride 0 [ { address = "fd00::2"; prefixLength = 64; } ];
             interfaces.eth1.ipv4.addresses = mkOverride 0 [ { address = "192.168.1.2"; prefixLength = 24; } ];
           };
@@ -20,6 +21,7 @@ import ./make-test.nix ({ pkgs, ...} : {
         with pkgs.lib;
         {
           networking = {
+            dhcpcd.enable = 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; } ];
           };
@@ -51,7 +53,7 @@ import ./make-test.nix ({ pkgs, ...} : {
     ''
       startAll;
 
-      $client->waitForUnit("network.target");
+      $client->waitForUnit("network-online.target");
       $server->waitForUnit("ferm.service");
       $server->waitForUnit("nginx.service");
       $server->waitUntilSucceeds("ss -ntl | grep -q 80");