summary refs log tree commit diff
path: root/tests/quake3.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2010-02-04 13:59:31 +0000
committerEelco Dolstra <eelco.dolstra@logicblox.com>2010-02-04 13:59:31 +0000
commit5b60c280d7a5eb861d28889fb4f4fa55021e61c5 (patch)
tree2d41635190cf5941969680e7d46c6a00d3df010f /tests/quake3.nix
parent0f56bd755a85bacc7f85b0b6e55dc02f98feb524 (diff)
downloadnixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar.gz
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar.bz2
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar.lz
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar.xz
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.tar.zst
nixpkgs-5b60c280d7a5eb861d28889fb4f4fa55021e61c5.zip
* Make the Quake 3 test less timing-sensitive.
svn path=/nixos/trunk/; revision=19816
Diffstat (limited to 'tests/quake3.nix')
-rw-r--r--tests/quake3.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/quake3.nix b/tests/quake3.nix
index e3a190dda7a..a31a14ea18e 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -39,10 +39,10 @@ rec {
       $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
       $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
-      sleep 40;
+      $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
+      $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
-      $server->mustSucceed("grep -q 'Foo.*entered the game' /tmp/log");
-      $server->mustSucceed("grep -q 'Bar.*entered the game' /tmp/log");
+      sleep 30; # wait for a while to get a nice screenshot
 
       $client1->screenshot("screen1");
       $client2->screenshot("screen2");