From b18b70c74d5a2eadde6985ee9b2fac3411374eb5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 4 Aug 2017 17:52:42 +0200 Subject: [PATCH] nixos.tests.nat: fix --- nixos/tests/nat.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index f1097cdfc49a..a12b7645bc28 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -102,17 +102,17 @@ import ./make-test.nix ({ pkgs, lib, withFirewall, withConntrackHelpers ? false, # If we turn off NAT, the client shouldn't be able to reach the server. $router->succeed("${routerDummyNoNatClosure}/bin/switch-to-configuration test 2>&1"); - # FIXME: this should not be necessary, but nat.service is not started because - # network.target is not triggered - # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) - ${lib.optional (!withFirewall) '' - $router->succeed("systemctl start nat.service"); - ''} $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); $client->fail("ping -c 1 server >&2"); # And make sure that reloading the NAT job works. $router->succeed("${routerClosure}/bin/switch-to-configuration test 2>&1"); + # FIXME: this should not be necessary, but nat.service is not started because + # network.target is not triggered + # (https://github.com/NixOS/nixpkgs/issues/16230#issuecomment-226408359) + ${lib.optionalString (!withFirewall) '' + $router->succeed("systemctl start nat.service"); + ''} $client->succeed("curl --fail http://server/ >&2"); $client->succeed("ping -c 1 server >&2"); '';