public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Added a function waitForX, which returns when the X server accepts

Browse Source 
connections.
* In the root shell, source /etc/bashrc and set $HOME and $DISPLAY.  

svn path=/nixos/trunk/; revision=19247
This commit is contained in:
Eelco Dolstra
2010-01-05 23:59:29 +00:00
parent 5cc99487cb
commit bc68c2985c
7 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/default.nix
View File

@@ -23,8 +23,8 @@ let
in
{
kde4 = apply (import ./kde4.nix);
firefox = apply (import ./firefox.nix);
kde4 = apply (import ./kde4.nix);
quake3 = apply (import ./quake3.nix);
subversion = apply (import ./subversion.nix);
trac = apply (import ./trac.nix);

12
tests/firefox.nix
View File

@@ -11,14 +11,10 @@
testScript =
''
$machine->waitForFile("/tmp/.X11-unix/X0");
sleep 10;
$machine->execute("DISPLAY=:0.0 HOME=/root firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
sleep 30;
$machine->waitForX;
$machine->execute("firefox file://${pkgs.valgrind}/share/doc/valgrind/html/index.html &");
$machine->waitForWindow(/Valgrind.*Shiretoko/);
sleep 30; # wait until Firefox has finished loading the page
$machine->screenshot("screen");
'';

11
tests/quake3.nix
View File

@@ -33,14 +33,11 @@ rec {
startAll;
$server->waitForJob("quake3-server");
$client1->waitForFile("/tmp/.X11-unix/X0");
$client2->waitForFile("/tmp/.X11-unix/X0");
$client1->waitForX;
$client2->waitForX;
sleep 20;
$client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
$client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
$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;

9
tests/trac.nix
View File

@@ -65,11 +65,10 @@
$webserver->mustSucceed("mkdir -p /var/trac/projects/test");
$webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/python2.5/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
$client->waitForFile("/tmp/.X11-unix/X0");
sleep 20;
$client->execute("su - root -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
sleep 90;
$client->waitForX;
$client->execute("konqueror http://webserver/projects/test &");
$client->waitForWindow(qr/Test.*Konqueror/);
sleep 30; # loading takes a long time
$client->screenshot("screen");
'';