summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-03-24 16:41:52 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-03-24 17:14:22 +0100
commit2438c61255657764a928878ca7e87d18e7a587cf (patch)
tree8584a48fc36adbe9cd63d925dd29b3a92bcfcb4d
parent1ca46105773a318dbd5d9a53e9704610de43b209 (diff)
downloadnixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar.gz
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar.bz2
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar.lz
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar.xz
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.tar.zst
nixlib-2438c61255657764a928878ca7e87d18e7a587cf.zip
dnscrypt-proxy vmtest: more specific waitForUnit
The test sometimes times out waiting for multi-user.target; this
should be more robust.
-rw-r--r--nixos/tests/dnscrypt-proxy.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/tests/dnscrypt-proxy.nix b/nixos/tests/dnscrypt-proxy.nix
index 20ec3a333e77..b686e9582a7d 100644
--- a/nixos/tests/dnscrypt-proxy.nix
+++ b/nixos/tests/dnscrypt-proxy.nix
@@ -23,10 +23,11 @@ import ./make-test.nix ({ pkgs, ... }: {
 
   testScript = ''
     $client->start;
-    $client->waitForUnit("multi-user.target");
+    $client->waitForUnit("sockets.target");
+    $client->waitForUnit("dnsmasq");
 
     # The daemon is socket activated; sending a single ping should activate it.
     $client->execute("${pkgs.iputils}/bin/ping -c1 example.com");
-    $client->succeed("systemctl is-active dnscrypt-proxy.service");
+    $client->succeed("systemctl is-active dnscrypt-proxy");
   '';
 })