diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-24 18:11:21 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-10-24 18:11:21 +0200 |
| commit | d380152f39450070d9cd7e7a8272b2b1b8bd6b12 (patch) | |
| tree | a2289f581767ca85fb4e30ed03ef0e2639ab8cdc /tests | |
| parent | b6f9e0526995d3d571cb4ee0819fb51a23571019 (diff) | |
| download | nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar.gz nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar.bz2 nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar.lz nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar.xz nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.tar.zst nixpkgs-d380152f39450070d9cd7e7a8272b2b1b8bd6b12.zip | |
Update some tests for systemd
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/firewall.nix | 2 | ||||
| -rw-r--r-- | tests/nat.nix | 2 | ||||
| -rw-r--r-- | tests/quake3.nix | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/tests/firewall.nix b/tests/firewall.nix index 060dbb6082c..316ee439b45 100644 --- a/tests/firewall.nix +++ b/tests/firewall.nix @@ -41,7 +41,7 @@ $walled->succeed("ping -c 1 attacker >&2"); # If we stop the firewall, then connections should succeed. - $walled->succeed("stop firewall"); + $walled->stopJob("firewall"); $attacker->succeed("curl -v http://walled/ >&2"); ''; diff --git a/tests/nat.nix b/tests/nat.nix index 24f390f24cb..ca02fa137d4 100644 --- a/tests/nat.nix +++ b/tests/nat.nix @@ -63,7 +63,7 @@ $router->succeed("ping -c 1 client >&2"); # If we turn off NAT, the client shouldn't be able to reach the server. - $router->succeed("stop nat"); + $router->stopJob("nat"); $client->fail("curl --fail --connect-timeout 5 http://server/ >&2"); $client->fail("ping -c 1 server >&2"); diff --git a/tests/quake3.nix b/tests/quake3.nix index fbd0adab2fa..796c300423d 100644 --- a/tests/quake3.nix +++ b/tests/quake3.nix @@ -28,9 +28,8 @@ rec { { server = { config, pkgs, ... }: - { jobs.quake3Server = - { name = "quake3-server"; - startOn = "startup"; + { jobs."quake3-server" = + { startOn = "startup"; exec = "${pkgs.quake3demo}/bin/quake3-server '+set g_gametype 0' " + "'+map q3dm7' '+addbot grunt' '+addbot daemia' 2> /tmp/log"; @@ -74,7 +73,7 @@ rec { $client1->shutdown(); $client2->shutdown(); - $server->succeed("stop quake3-server"); + $server->stopJob("quake3-server"); ''; } |