summary refs log tree commit diff
path: root/nixos/tests/firewall.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-11 17:15:56 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-04-11 17:16:44 +0200
commit13185280fee4111dc07f794e528fa3a73f421f3a (patch)
tree40f813ae0cf436e9bbe3a8364b046c6f93ffc2fc /nixos/tests/firewall.nix
parent017408e048ae2419baf0adba424b51d85b063a30 (diff)
downloadnixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar.gz
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar.bz2
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar.lz
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar.xz
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.tar.zst
nixpkgs-13185280fee4111dc07f794e528fa3a73f421f3a.zip
Fix tests broken due to the firewall being enabled by default
Diffstat (limited to 'nixos/tests/firewall.nix')
-rw-r--r--nixos/tests/firewall.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/tests/firewall.nix b/nixos/tests/firewall.nix
index de32b98e5d2..15653dedf3c 100644
--- a/nixos/tests/firewall.nix
+++ b/nixos/tests/firewall.nix
@@ -17,6 +17,7 @@
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
+          networking.firewall.enable = false;
         };
     };
 
@@ -33,7 +34,7 @@
       $walled->succeed("curl -v http://localhost/ >&2");
 
       # Connections to the firewalled machine should fail.
-      $attacker->fail("curl -v http://walled/ >&2");
+      $attacker->fail("curl --fail --connect-timeout 2 http://walled/ >&2");
       $attacker->fail("ping -c 1 walled >&2");
 
       # Outgoing connections/pings should still work.