about summary refs log tree commit diff
diff options
context:
space:
mode:
authorReno Reckling <exi@wthack.de>2016-09-13 22:56:27 +0300
committerDomen Kožar <domen@dev.si>2016-09-13 22:46:46 +0200
commit8ea8659f2962b955d6bb56bf5d2e76d7249a94a3 (patch)
treea113e69efed4f4bcb842d24835ee154555dd1d21
parent77b9abf78c01d79320353d5f9c1d6d6ed3ef000b (diff)
downloadnixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar.gz
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar.bz2
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar.lz
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar.xz
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.tar.zst
nixlib-8ea8659f2962b955d6bb56bf5d2e76d7249a94a3.zip
Remove tomcat vm test timing issues
(cherry picked from commit 090f1f0722b79cbba5f0abccac61496398789762)
Signed-off-by: Domen Kožar <domen@dev.si>
-rw-r--r--nixos/tests/tomcat.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/nixos/tests/tomcat.nix b/nixos/tests/tomcat.nix
index 92680d82ba89..475c947e72d9 100644
--- a/nixos/tests/tomcat.nix
+++ b/nixos/tests/tomcat.nix
@@ -23,9 +23,8 @@ import ./make-test.nix ({ pkgs, ...} : {
     startAll;
 
     $server->waitForUnit("tomcat");
-    $server->sleep(30); # Dirty, but it takes a while before Tomcat handles to requests properly
     $client->waitForUnit("network.target");
-    $client->succeed("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
-    $client->succeed("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
+    $client->waitUntilSucceeds("curl --fail http://server/examples/servlets/servlet/HelloWorldExample");
+    $client->waitUntilSucceeds("curl --fail http://server/examples/jsp/jsp2/simpletag/hello.jsp");
   '';
 })