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

* More cleanups.

Browse Source 
svn path=/nixos/trunk/; revision=19228
This commit is contained in:
Eelco Dolstra 2010-01-05 11:57:17 +00:00
parent ff20b45486
commit 8343b8b902
5 changed files with 15 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/default.nix
View File

@ -26,4 +26,5 @@ in
kde4 = apply (import ./kde4.nix); kde4 = apply (import ./kde4.nix);
quake3 = apply (import ./quake3.nix); quake3 = apply (import ./quake3.nix);
subversion = apply (import ./subversion.nix); subversion = apply (import ./subversion.nix);
trac = apply (import ./trac.nix);
} }

4
tests/kde4.nix
View File

@ -40,11 +40,11 @@
sleep 70; sleep 70;
print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'"); $machine->execute("su - alice -c 'DISPLAY=:0.0 kwrite /var/log/messages &'");
sleep 10; sleep 10;
print STDERR $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'"); $machine->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://localhost/ &'");
sleep 10; sleep 10;

8
tests/quake3.nix
View File

@ -38,11 +38,11 @@ rec {
sleep 20; sleep 20;
print STDERR $client1->execute("DISPLAY=:0.0 icewm &"); $client1->execute("DISPLAY=:0.0 icewm &");
print STDERR $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &"); $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
print STDERR $client2->execute("DISPLAY=:0.0 icewm &"); $client2->execute("DISPLAY=:0.0 icewm &");
print STDERR $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &"); $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
sleep 40; sleep 40;

6
tests/subversion.nix
View File

@ -66,11 +66,9 @@ in
$webserver->waitForOpenPort(80); $webserver->waitForOpenPort(80);
my $out = $client->mustSucceed("svn --version"); print STDERR $client->mustSucceed("svn --version");
print STDERR "GOT: $out";
my $out = $client->mustSucceed("curl --fail http://webserver/"); print STDERR $client->mustSucceed("curl --fail http://webserver/");
print STDERR "GOT: $out";
# Create a new user through the web interface. # Create a new user through the web interface.
$client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser"); $client->mustSucceed("curl --fail -F username=alice -F fullname='Alice Lastname' -F address=alice\@example.org -F password=foobar -F password_again=foobar http://webserver/repoman/adduser");

20
tests/trac.nix
View File

@ -1,12 +1,6 @@
{ nixos ? ./.. { pkgs, ... }:
, nixpkgs ? /etc/nixos/nixpkgs
, services ? /etc/nixos/services
, system ? builtins.currentSystem
}:
with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; }; {
rec {
nodes = { nodes = {
storage = storage =
{pkgs, config, ...}: {pkgs, config, ...}:
@ -77,13 +71,11 @@ rec {
}; };
}; };
vms = buildVirtualNetwork { inherit nodes; }; testScript =
test = runTests vms
'' ''
startAll; startAll;
$postgresql->waitForFile("/tmp/.s.PGSQL.5432"); $postgresql->waitForJob("postgresql");
$postgresql->mustSucceed("createdb trac"); $postgresql->mustSucceed("createdb trac");
$webserver->mustSucceed("mkdir -p /repos/trac"); $webserver->mustSucceed("mkdir -p /repos/trac");
@ -96,9 +88,9 @@ rec {
$client->waitForFile("/tmp/.X11-unix/X0"); $client->waitForFile("/tmp/.X11-unix/X0");
sleep 60; sleep 60;
print STDERR $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'"); $client->execute("su - alice -c 'DISPLAY=:0.0 konqueror http://webserver/projects/test &'");
sleep 120; sleep 120;
print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png"); $client->screenshot("screen");
''; '';
} }