* A function to wait until a window exists.

svn path=/nixos/trunk/; revision=19246
2010-01-05 23:38:13 +00:00
parent 0f5b178fcf
commit 5cc99487cb
3 changed files with 28 additions and 7 deletions
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -36,18 +36,16 @@

  testScript =
    ''
-      $machine->waitForFile("/tmp/.X11-unix/X0");
-
-      sleep 70;
+      $machine->waitForWindow(qr/plasma-desktop/);

      $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
-
-      sleep 10;
-      
      $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");

-      sleep 10;
+      $machine->waitForWindow(qr/messages.*KWrite/);
+      $machine->waitForWindow(qr/Valgrind.*Konqueror/);

+      sleep 5;
+      
      $machine->screenshot("screen");
    '';