From 8343b8b902782c5b4bf35bf8a315821b67e653d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 5 Jan 2010 11:57:17 +0000
Subject: [PATCH] * More cleanups.

svn path=/nixos/trunk/; revision=19228
---
 tests/default.nix    |  1 +
 tests/kde4.nix       |  4 ++--
 tests/quake3.nix     |  8 ++++----
 tests/subversion.nix |  6 ++----
 tests/trac.nix       | 20 ++++++--------------
 5 files changed, 15 insertions(+), 24 deletions(-)

diff --git a/tests/default.nix b/tests/default.nix
index 269b1bffa6a..eb0b3909322 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -26,4 +26,5 @@ in
   kde4 = apply (import ./kde4.nix);
   quake3 = apply (import ./quake3.nix);
   subversion = apply (import ./subversion.nix);
+  trac = apply (import ./trac.nix);
 }
diff --git a/tests/kde4.nix b/tests/kde4.nix
index e1e323f4a6f..f13b87b0763 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -40,11 +40,11 @@
 
       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;
       
-      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;
 
diff --git a/tests/quake3.nix b/tests/quake3.nix
index ee95d95a98a..9af01214b6c 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -38,11 +38,11 @@ rec {
 
       sleep 20;
 
-      print STDERR $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 icewm &");
+      $client1->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
  
-      print STDERR $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 icewm &");
+      $client2->execute("DISPLAY=:0.0 quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
  
       sleep 40;
 
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 075dc0e35a3..5354a40452b 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -66,11 +66,9 @@ in
 
       $webserver->waitForOpenPort(80);
 
-      my $out = $client->mustSucceed("svn --version");
-      print STDERR "GOT: $out";
+      print STDERR $client->mustSucceed("svn --version");
 
-      my $out = $client->mustSucceed("curl --fail http://webserver/");
-      print STDERR "GOT: $out";
+      print STDERR $client->mustSucceed("curl --fail http://webserver/");
 
       # 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");
diff --git a/tests/trac.nix b/tests/trac.nix
index 6db5a382802..f544c5e99cd 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -1,12 +1,6 @@
-{ nixos ? ./..
-, nixpkgs ? /etc/nixos/nixpkgs
-, services ? /etc/nixos/services
-, system ? builtins.currentSystem
-}:
+{ pkgs, ... }:
 
-with import ../lib/build-vms.nix { inherit nixos nixpkgs services system; };
-
-rec {
+{
   nodes = {
     storage = 
       {pkgs, config, ...}:
@@ -77,13 +71,11 @@ rec {
       };
   };
     
-  vms = buildVirtualNetwork { inherit nodes; };
-
-  test = runTests vms
+  testScript =
     ''
       startAll;
       
-      $postgresql->waitForFile("/tmp/.s.PGSQL.5432");
+      $postgresql->waitForJob("postgresql");
       $postgresql->mustSucceed("createdb trac");
       
       $webserver->mustSucceed("mkdir -p /repos/trac");
@@ -96,9 +88,9 @@ rec {
       $client->waitForFile("/tmp/.X11-unix/X0");
       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;
       
-      print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
+      $client->screenshot("screen");
     '';
 }