From 7fc8a1fd982b0660e3f6ef553a11486ee4cc1841 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <s.vanderburg@tudelft.nl>
Date: Fri, 4 Sep 2009 14:45:30 +0000
Subject: [PATCH] Fixed some bugs in the Trac testcase

svn path=/nixos/trunk/; revision=16957
---
 tests/trac.nix | 74 ++++++++++++++++++++++++++++++++++++++------------
 1 file changed, 56 insertions(+), 18 deletions(-)

diff --git a/tests/trac.nix b/tests/trac.nix
index 829f2c5755c..bf10ad68a54 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -41,12 +41,14 @@ rec {
     
           postgresql = {
             enable = true;
-      
+    	    enableTCPIP = true;
+	    
             authentication = ''
               # Generated file; do not edit!
-              local all all              trust
-              host  all all 127.0.0.1/32 trust
-	      host  all all ::1/128      trust
+              local all all                trust
+              host  all all 127.0.0.1/32   trust
+	      host  all all ::1/128        trust
+	      host  all all 192.168.1.0/24 trust
             '';
           };
         };  
@@ -56,9 +58,13 @@ rec {
       {config, pkgs, ...}:
       {
         services = {
+	  portmap = {
+	    enable = true;
+	  };
+
           nfsKernel = {
             enable = true;
-          };
+          };	  
   
           httpd = {
             enable = true;
@@ -80,14 +86,45 @@ rec {
         services = {
 	  xserver = {
 	    enable = true;
-            driSupport = true;
+
+            displayManager = {
+	      slim = {
+	        enable = false;
+	      };
+              kdm = {
+	        enable = true;
+		extraConfig =
+                  ''
+                    [X-:0-Core]
+                    AutoLoginEnable=true
+                    AutoLoginUser=alice
+                    AutoLoginPass=foobar
+                  '';
+	      };
+	    };
+	    desktopManager = {
+	      default = "kde4";
+	      kde4 = {
+	        enable = true;
+	      };
+	    };            
 	  };
 	};
-	  
+	
+	users = {
+	  extraUsers = pkgs.lib.singleton { 
+	      name = "alice";
+              description = "Alice Foobar";
+              home = "/home/alice";
+              createHome = true;
+              useDefaultShell = true;
+              password = "foobar";
+          };
+        };
+ 
         environment = {
 	  extraPackages = [
-	    pkgs.firefox
-	    pkgs.icewm
+	    pkgs.firefoxWrapper
 	    pkgs.scrot
 	  ];
 	};
@@ -102,21 +139,22 @@ rec {
       
       $storage->mustSucceed("mkdir -p /repos/trac");
       $storage->mustSucceed("svnadmin create /repos/trac");
-      $webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
       
-      #$postgresql->waitForFile("/tmp/.s.PGSQL.5432");
-      #$postgresql->mustSucceed("createdb trac");
+      $postgresql->waitForFile("/tmp/.s.PGSQL.5432");
+      $postgresql->mustSucceed("createdb trac");
+
+      $webserver->mustSucceed("mkdir -p /repos/trac");
+      #$webserver->mustSucceed("mount storage:/repos/trac /repos/trac");
       
       $webserver->waitForFile("/var/trac");
-      $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 -v");
-      
-      sleep 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");
-      print STDERR $client->execute("DISPLAY=:0.0 icewm &");
-      print STDERR $client->execute("DISPLAY=:0.0 firefox http://webserver/projects/test &");
+      sleep 60;
       
-      sleep 40;
+      print STDERR $client->execute("DISPLAY=:0.0 konqueror http://webserver/projects/test &");
+      sleep 30;
       
       print STDERR $client->execute("DISPLAY=:0.0 scrot /hostfs/$ENV{out}/screen1.png");
     '';