summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
committerPeter Simons <simons@cryp.to>2011-09-14 18:20:50 +0000
commiteb6e1310b8774f3aed4c5675d09708f0df6199d3 (patch)
tree3297542b3cda78d38731abb65837f4553cd377a9 /tests
parentf5e8d35f8e76755febf97ca8f62b0700a8b6d20a (diff)
downloadnixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.gz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.bz2
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.lz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.xz
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.tar.zst
nixpkgs-eb6e1310b8774f3aed4c5675d09708f0df6199d3.zip
strip trailing whitespace; no functional change
svn path=/nixos/trunk/; revision=29285
Diffstat (limited to 'tests')
-rw-r--r--tests/bittorrent.nix12
-rw-r--r--tests/check-filesystems.nix6
-rw-r--r--tests/firefox.nix4
-rw-r--r--tests/firewall.nix4
-rw-r--r--tests/installer.nix42
-rw-r--r--tests/ipv6.nix16
-rw-r--r--tests/kde4.nix6
-rw-r--r--tests/login.nix6
-rw-r--r--tests/mysql-replication.nix18
-rw-r--r--tests/mysql.nix10
-rw-r--r--tests/nat.nix12
-rw-r--r--tests/nfs.nix10
-rw-r--r--tests/openssh.nix22
-rw-r--r--tests/proxy.nix2
-rw-r--r--tests/quake3.nix8
-rw-r--r--tests/remote-builds.nix2
-rw-r--r--tests/subversion.nix10
-rw-r--r--tests/tomcat.nix8
-rw-r--r--tests/trac.nix28
-rw-r--r--tests/xfce.nix10
20 files changed, 118 insertions, 118 deletions
diff --git a/tests/bittorrent.nix b/tests/bittorrent.nix
index dce8e3b3725..8951e5bad1b 100644
--- a/tests/bittorrent.nix
+++ b/tests/bittorrent.nix
@@ -19,13 +19,13 @@ let
       listening_ip=${nodes.router.config.networking.ifaces.eth2.ipAddress}/24
       allow 1024-65535 192.168.2.0/24 1024-65535
     '';
-  
+
 in
 
 {
 
   nodes =
-    { tracker = 
+    { tracker =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission pkgs.bittorrent ];
 
@@ -35,7 +35,7 @@ in
           services.httpd.documentRoot = "/tmp";
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.miniupnpd ];
           virtualisation.vlans = [ 1 2 ];
@@ -44,7 +44,7 @@ in
           networking.nat.externalInterface = "eth1";
         };
 
-      client1 = 
+      client1 =
         { config, pkgs, nodes, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
           virtualisation.vlans = [ 2 ];
@@ -52,7 +52,7 @@ in
             nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
-      client2 = 
+      client2 =
         { config, pkgs, ... }:
         { environment.systemPackages = [ pkgs.transmission ];
         };
@@ -103,5 +103,5 @@ in
       $client2->waitForFile("/tmp/test.tar.bz2");
       $client2->succeed("cmp /tmp/test.tar.bz2 ${file}");
     '';
-  
+
 }
diff --git a/tests/check-filesystems.nix b/tests/check-filesystems.nix
index 882f5cd3153..ba2bf352ec8 100644
--- a/tests/check-filesystems.nix
+++ b/tests/check-filesystems.nix
@@ -44,9 +44,9 @@ rec {
             autocreate = true;
             device = "share:/repos2";
           };
-        in pkgs.lib.mkOverrideTemplate 50 {} [ 
+        in pkgs.lib.mkOverrideTemplate 50 {} [
           repos1
-          repos1 # check remount 
+          repos1 # check remount
           repos2 # check after remount
         ];
 
@@ -56,7 +56,7 @@ rec {
       };
     };
   };
-    
+
   vms = buildVirtualNetwork { inherit nodes; };
 
   test = runTests vms
diff --git a/tests/firefox.nix b/tests/firefox.nix
index 7e1e192c808..adb936dc1ae 100644
--- a/tests/firefox.nix
+++ b/tests/firefox.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/x11.nix ];
@@ -17,5 +17,5 @@
       $machine->sleep(40); # wait until Firefox has finished loading the page
       $machine->screenshot("screen");
     '';
-  
+
 }
diff --git a/tests/firewall.nix b/tests/firewall.nix
index d2d2568f1cd..b38cd988b76 100644
--- a/tests/firewall.nix
+++ b/tests/firewall.nix
@@ -5,7 +5,7 @@
 {
 
   nodes =
-    { walled = 
+    { walled =
         { config, pkgs, nodes, ... }:
         { networking.firewall.enable = true;
           networking.firewall.logRefusedPackets = true;
@@ -13,7 +13,7 @@
           services.httpd.adminAddr = "foo@example.org";
         };
 
-      attacker = 
+      attacker =
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
diff --git a/tests/installer.nix b/tests/installer.nix
index bc88c7c68a4..900457dfabd 100644
--- a/tests/installer.nix
+++ b/tests/installer.nix
@@ -13,9 +13,9 @@ let
       modules =
         [ ../modules/installer/cd-dvd/installation-cd-graphical.nix
           ../modules/testing/test-instrumentation.nix
-          { key = "serial"; 
+          { key = "serial";
             boot.loader.grub.timeout = mkOverrideTemplate 0 {} 0;
-            
+
             # The test cannot access the network, so any sources we
             # need must be included in the ISO.
             isoImage.storeContents =
@@ -27,7 +27,7 @@ let
         ];
     }).config.system.build.isoImage;
 
-    
+
   # The configuration to install.
   config = { fileSystems, testChannel }: pkgs.writeText "configuration.nix"
     ''
@@ -42,7 +42,7 @@ let
         boot.loader.grub.device = "/dev/vda";
         boot.loader.grub.extraConfig = "serial; terminal_output.serial";
         boot.initrd.kernelModules = [ "ext3" "virtio_console" ];
-      
+
         fileSystems = [ ${fileSystems} ];
         swapDevices = [ { label = "swap"; } ];
 
@@ -56,7 +56,7 @@ let
         device = "/dev/disk/by-label/nixos";
       }
     '';
-    
+
   bootFS =
     ''
       { mountPoint = "/boot";
@@ -64,10 +64,10 @@ let
       }
     '';
 
-    
+
   # Configuration of a web server that simulates the Nixpkgs channel
   # distribution server.
-  webserver = 
+  webserver =
     { config, pkgs, ... }:
 
     { services.httpd.enable = true;
@@ -82,7 +82,7 @@ let
     };
 
   channelContents = [ pkgs.hello.src pkgs.rlwrap ];
-  
+
 
   # The test script boots the CD, installs NixOS on an empty hard
   # disk, and then reboot from the hard disk.  It's parameterized with
@@ -93,7 +93,7 @@ let
     ''
       createDisk("harddisk", 4 * 1024);
 
-      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"), 
+      my $machine = createMachine({ hda => "harddisk", cdrom => glob("${iso}/iso/*.iso"),
         qemuFlags => '${if testChannel then qemuNICFlags 1 1 2 else ""}'});
       $machine->start;
 
@@ -108,7 +108,7 @@ let
             "http://nixos.org/releases/nixpkgs/channels/nixpkgs-unstable " .
             "file:///tmp/channel/MANIFEST ${toString channelContents} >&2");
       ''}
-      
+
       # Make sure that we get a login prompt etc.
       $machine->mustSucceed("echo hello");
       $machine->waitForJob("tty1");
@@ -150,14 +150,14 @@ let
 
       # Perform the installation.
       $machine->mustSucceed("nixos-install >&2");
-      
+
       $machine->mustSucceed("cat /mnt/boot/grub/grub.cfg >&2");
-      
+
       $machine->shutdown;
 
       # Now see if we can boot the installation.
       my $machine = createMachine({ hda => "harddisk" });
-      
+
       # Did /boot get mounted, if appropriate?
       # !!! There is currently no good way to wait for the
       # `filesystems' task to finish.
@@ -166,7 +166,7 @@ let
       # Did the swap device get activated?
       # !!! Idem.
       $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev");
-      
+
       $machine->mustSucceed("nix-env -i coreutils >&2");
       $machine->mustSucceed("type -tP ls | tee /dev/stderr") =~ /.nix-profile/
           or die "nix-env failed";
@@ -174,7 +174,7 @@ let
       $machine->mustSucceed("nixos-rebuild switch >&2");
 
       $machine->mustSucceed("cat /boot/grub/grub.cfg >&2");
-      
+
       $machine->shutdown;
 
       # And just to be sure, check that the machine still boots after
@@ -184,7 +184,7 @@ let
       $machine->shutdown;
     '';
 
-    
+
   makeTest = { createPartitions, fileSystems, testChannel ? false }:
     { inherit iso;
       nodes = if testChannel then { inherit webserver; } else { };
@@ -192,7 +192,7 @@ let
         inherit createPartitions fileSystems testChannel;
       };
     };
-    
+
 
 in {
 
@@ -202,7 +202,7 @@ in {
   # The (almost) simplest partitioning scheme: a swap partition and
   # one big filesystem partition.
   simple = makeTest
-    { createPartitions = 
+    { createPartitions =
         ''
           $machine->mustSucceed(
               "parted /dev/vda mklabel msdos",
@@ -218,7 +218,7 @@ in {
       fileSystems = rootFS;
       testChannel = true;
     };
-      
+
   # Same as the previous, but now with a separate /boot partition.
   separateBoot = makeTest
     { createPartitions =
@@ -240,7 +240,7 @@ in {
         '';
       fileSystems = rootFS + bootFS;
     };
-  
+
   # Create two physical LVM partitions combined into one volume group
   # that contains the logical swap and root partitions.
   lvm = makeTest
@@ -296,7 +296,7 @@ in {
     };
 
   # Rebuild the CD configuration with a little modification.
-  rebuildCD = 
+  rebuildCD =
     { inherit iso;
       nodes = { };
       testScript =
diff --git a/tests/ipv6.nix b/tests/ipv6.nix
index 76958ab445d..4a308416aef 100644
--- a/tests/ipv6.nix
+++ b/tests/ipv6.nix
@@ -7,14 +7,14 @@
 
   nodes =
     { client = { config, pkgs, ... }: { };
-    
+
       server =
         { config, pkgs, ... }:
         { services.httpd.enable = true;
           services.httpd.adminAddr = "foo@example.org";
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { services.radvd.enable = true;
           services.radvd.config =
@@ -32,9 +32,9 @@
     ''
       # Start the router first so that it respond to router solicitations.
       $router->waitForJob("radvd");
-    
+
       startAll;
-    
+
       $client->waitForJob("network-interfaces");
       $server->waitForJob("network-interfaces");
 
@@ -48,12 +48,12 @@
           $machine->log("$scope address on $iface is $ip");
           return $ip;
       }
-      
+
       subtest "loopback address", sub {
-          $client->succeed("ping6 -c 1 ::1 >&2");  
-          $client->fail("ping6 -c 1 ::2 >&2");  
+          $client->succeed("ping6 -c 1 ::1 >&2");
+          $client->fail("ping6 -c 1 ::2 >&2");
       };
-    
+
       subtest "local link addressing", sub {
           my $clientIp = waitForAddress $client, "eth1", "link";
           my $serverIp = waitForAddress $server, "eth1", "link";
diff --git a/tests/kde4.nix b/tests/kde4.nix
index ff75758429d..afdf1754942 100644
--- a/tests/kde4.nix
+++ b/tests/kde4.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/user-account.nix ];
@@ -40,8 +40,8 @@
       $machine->waitForWindow(qr/Valgrind.*Konqueror/);
 
       $machine->sleep(5);
-      
+
       $machine->screenshot("screen");
     '';
-  
+
 }
diff --git a/tests/login.nix b/tests/login.nix
index 3567b6bc246..90987782f8c 100644
--- a/tests/login.nix
+++ b/tests/login.nix
@@ -23,7 +23,7 @@
           $machine->sendChars("touch done\n");
           $machine->waitForFile("/home/alice/done");
       };
-      
+
       # Check whether switching VTs works.
       subtest "virtual console switching", sub {
           $machine->sendKeys("alt-f10");
@@ -50,12 +50,12 @@
           $machine->waitUntilFails("pgrep -u alice bash");
           $machine->screenshot("mingetty");
       };
-      
+
       # Check whether ctrl-alt-delete works.
       subtest "ctrl-alt-delete", sub {
           $machine->sendKeys("ctrl-alt-delete");
           $machine->waitForShutdown;
       };
     '';
-  
+
 }
diff --git a/tests/mysql-replication.nix b/tests/mysql-replication.nix
index db72e45f685..5ac7f0a5097 100644
--- a/tests/mysql-replication.nix
+++ b/tests/mysql-replication.nix
@@ -6,9 +6,9 @@ let
 in
 {
   nodes = {
-    master = 
+    master =
       { pkgs, config, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "master";
@@ -19,22 +19,22 @@ in
           grant replication slave on *.* to '${replicateUser}'@'%';
         '';
       };
-    
+
     slave1 =
       { pkgs, config, nodes, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
 	services.mysql.replication.serverId = 2;
 	services.mysql.replication.masterHost = nodes.master.config.networking.hostName;
 	services.mysql.replication.masterUser = replicateUser;
-	services.mysql.replication.masterPassword = replicatePassword;	
+	services.mysql.replication.masterPassword = replicatePassword;
       };
-      
+
     slave2 =
       { pkgs, config, nodes, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "slave";
@@ -44,10 +44,10 @@ in
 	services.mysql.replication.masterPassword = replicatePassword;
       };
   };
-  
+
   testScript = ''
     startAll;
-    
+
     $master->waitForJob("mysql");
     $master->waitForJob("mysql");
     $slave2->waitForJob("mysql");
diff --git a/tests/mysql.nix b/tests/mysql.nix
index cb8f1247909..65785c8fdb5 100644
--- a/tests/mysql.nix
+++ b/tests/mysql.nix
@@ -2,19 +2,19 @@
 
 {
   nodes = {
-    master = 
+    master =
       { pkgs, config, ... }:
-      
+
       {
         services.mysql.enable = true;
 	services.mysql.replication.role = "master";
 	services.mysql.initialDatabases = [ { name = "testdb"; schema = ./testdb.sql; } ];
-      };    
+      };
   };
-  
+
   testScript = ''
     startAll;
-    
+
     $master->waitForJob("mysql");
     $master->sleep(10); # Hopefully this is long enough!!
     $master->mustSucceed("echo 'use testdb; select * from tests' | mysql -u root -N | grep 4");
diff --git a/tests/nat.nix b/tests/nat.nix
index 5466106a43d..5adbf3ce57d 100644
--- a/tests/nat.nix
+++ b/tests/nat.nix
@@ -9,14 +9,14 @@
 {
 
   nodes =
-    { client = 
+    { client =
         { config, pkgs, nodes, ... }:
         { virtualisation.vlans = [ 1 ];
           networking.defaultGateway =
             nodes.router.config.networking.ifaces.eth2.ipAddress;
         };
 
-      router = 
+      router =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 1 ];
           networking.nat.enable = true;
@@ -24,7 +24,7 @@
           networking.nat.externalInterface = "eth1";
         };
 
-      server = 
+      server =
         { config, pkgs, ... }:
         { virtualisation.vlans = [ 2 ];
           services.httpd.enable = true;
@@ -49,19 +49,19 @@
       $client->waitForJob("network-interfaces");
       $client->succeed("curl --fail http://server/ >&2");
       $client->succeed("ping -c 1 server >&2");
-      
+
       # Test whether passive FTP works.
       $server->waitForJob("vsftpd");
       $server->succeed("echo Hello World > /home/ftp/foo.txt");
       $client->succeed("curl -v ftp://server/foo.txt >&2");
-      
+
       # Test whether active FTP works.
       $client->succeed("curl -v -P - ftp://server/foo.txt >&2");
 
       # Test ICMP.
       $client->succeed("ping -c 1 router >&2");
       $router->succeed("ping -c 1 client >&2");
-      
+
       # If we turn off NAT, the client shouldn't be able to reach the server.
       $router->succeed("stop nat");
       $client->fail("curl --fail --connect-timeout 5 http://server/ >&2");
diff --git a/tests/nfs.nix b/tests/nfs.nix
index c8ead3d8930..e4576e451b8 100644
--- a/tests/nfs.nix
+++ b/tests/nfs.nix
@@ -2,14 +2,14 @@
 
 let
 
-  client = 
+  client =
     { config, pkgs, ... }:
-    { fileSystems = pkgs.lib.mkOverride 50 
+    { fileSystems = pkgs.lib.mkOverride 50
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
             options = "bootwait";
-          } 
+          }
         ];
     };
 
@@ -21,7 +21,7 @@ in
     { client1 = client;
       client2 = client;
 
-      server = 
+      server =
         { config, pkgs, ... }:
         { services.nfsKernel.server.enable = true;
           services.nfsKernel.server.exports =
@@ -52,7 +52,7 @@ in
       # seconds because the NFS server waits that long after booting
       # before accepting new locks.
       $client2->succeed("time flock -n -s /data/lock true");
-      
+
       # Test locking: client 1 acquires an exclusive lock, so client 2
       # should then fail to acquire a shared lock.
       $client1->succeed("flock -x /data/lock -c 'touch locked; sleep 100000' &");
diff --git a/tests/openssh.nix b/tests/openssh.nix
index 0e8bd3e2b9d..5818c9d6ceb 100644
--- a/tests/openssh.nix
+++ b/tests/openssh.nix
@@ -2,33 +2,33 @@
 
 {
   nodes = {
-  
-    server = 
+
+    server =
       { config, pkgs, ... }:
-      
+
       {
         services.openssh.enable = true;
       };
-      
-    client = 
+
+    client =
       { config, pkgs, ... }: { };
-      
+
   };
-  
+
   testScript = ''
     startAll;
-    
+
     my $key=`${pkgs.openssh}/bin/ssh-keygen -t dsa -f key -N ""`;
 
     $server->waitForJob("sshd");
-    
+
     $server->mustSucceed("mkdir -m 700 /root/.ssh");
     $server->copyFileFromHost("key.pub", "/root/.ssh/authorized_keys");
-    
+
     $client->mustSucceed("mkdir -m 700 /root/.ssh");
     $client->copyFileFromHost("key", "/root/.ssh/id_dsa");
     $client->mustSucceed("chmod 600 /root/.ssh/id_dsa");
-    
+
     $client->waitForJob("network-interfaces");
     $client->mustSucceed("ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world'");
   '';
diff --git a/tests/proxy.nix b/tests/proxy.nix
index 685d5a36f5d..323b548de74 100644
--- a/tests/proxy.nix
+++ b/tests/proxy.nix
@@ -2,7 +2,7 @@
 
 let
 
-  backend = 
+  backend =
     { config, pkgs, ... }:
 
     {
diff --git a/tests/quake3.nix b/tests/quake3.nix
index c21a1506b65..fbd0adab2fa 100644
--- a/tests/quake3.nix
+++ b/tests/quake3.nix
@@ -11,10 +11,10 @@ let
     };
 
 in
-      
+
 rec {
 
-  client = 
+  client =
     { config, pkgs, ... }:
 
     { require = [ ./common/x11.nix ];
@@ -52,7 +52,7 @@ rec {
 
       $client1->execute("quake3 '+set r_fullscreen 0' '+set name Foo' '+connect server' &");
       $client2->execute("quake3 '+set r_fullscreen 0' '+set name Bar' '+connect server' &");
- 
+
       $server->waitUntilSucceeds("grep -q 'Foo.*entered the game' /tmp/log");
       $server->waitUntilSucceeds("grep -q 'Bar.*entered the game' /tmp/log");
 
@@ -76,5 +76,5 @@ rec {
       $client2->shutdown();
       $server->succeed("stop quake3-server");
     '';
-  
+
 }
diff --git a/tests/remote-builds.nix b/tests/remote-builds.nix
index f55520b3501..80ba9c71e73 100644
--- a/tests/remote-builds.nix
+++ b/tests/remote-builds.nix
@@ -5,7 +5,7 @@
 let
 
   # The configuration of the build slaves.
-  slave = 
+  slave =
     { config, pkgs, ... }:
     { services.openssh.enable = true;
       virtualisation.writableStore = true;
diff --git a/tests/subversion.nix b/tests/subversion.nix
index 4a1ed62978e..fb8bba93806 100644
--- a/tests/subversion.nix
+++ b/tests/subversion.nix
@@ -30,7 +30,7 @@ let
       };
 
 in
-      
+
 {
 
   nodes =
@@ -73,11 +73,11 @@ in
       # 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");
 
-      # Let Alice create a new repository.      
+      # Let Alice create a new repository.
       $client->mustSucceed("curl --fail -u alice:foobar --form repo=xyzzy --form description=Xyzzy http://webserver/repoman/create");
 
       $client->mustSucceed("curl --fail http://webserver/") =~ /alice/ or die;
-      
+
       # Let Alice do a checkout.
       my $svnFlags = "--non-interactive --username alice --password foobar";
       $client->mustSucceed("svn co $svnFlags http://webserver/repos/xyzzy wc");
@@ -98,10 +98,10 @@ in
       # !!! Repoman should really return a 403 here.
       $client->succeed("curl --fail -u bob:fnord -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy")
           =~ /not authorised/ or die;
-      
+
       # Give Bob access.
       $client->mustSucceed("curl --fail -u alice:foobar -F description=Xyzzy -F readers=alice,bob -F writers=alice -F watchers= -F tardirs= http://webserver/repoman/update/xyzzy");
-      
+
       # So now his checkout should succeed.
       $client->mustSucceed("svn co $svnFlagsBob http://webserver/repos/xyzzy wc2");
 
diff --git a/tests/tomcat.nix b/tests/tomcat.nix
index bf601e834e1..0726a782250 100644
--- a/tests/tomcat.nix
+++ b/tests/tomcat.nix
@@ -2,9 +2,9 @@
 
 {
   nodes = {
-    server = 
+    server =
       { pkgs, config, ... }:
-      
+
       {
         services.tomcat.enable = true;
         services.httpd.enable = true;
@@ -16,10 +16,10 @@
           }
         ];
       };
-      
+
     client = { };
   };
-  
+
   testScript = ''
     startAll;
 
diff --git a/tests/trac.nix b/tests/trac.nix
index 9f3ea90261f..e13c0f15752 100644
--- a/tests/trac.nix
+++ b/tests/trac.nix
@@ -2,7 +2,7 @@
 
 {
   nodes = {
-    storage = 
+    storage =
       {pkgs, config, ...}:
       {
         services.portmap.enable = true;
@@ -28,16 +28,16 @@
         '';
       };
 
-    webserver = 
+    webserver =
       {config, pkgs, ...}:
       {
-        fileSystems = pkgs.lib.mkOverride 50  
+        fileSystems = pkgs.lib.mkOverride 50
           [ { mountPoint = "/repos";
               device = "storage:/repos";
 	      fsType = "nfs";
-	      options = "bootwait"; } 
+	      options = "bootwait"; }
           ];
-      
+
         services.portmap.enable = true;
         services.nfsKernel.client.enable = true;
         services.httpd.enable = true;
@@ -45,34 +45,34 @@
         services.httpd.extraSubservices = [ { serviceType = "trac"; } ];
         environment.systemPackages = [ pkgs.pythonPackages.trac pkgs.subversion ];
       };
-      
-    client = 
+
+    client =
       {config, pkgs, ...}:
       {
         require = [ ./common/x11.nix ];
         services.xserver.desktopManager.kde4.enable = true;
       };
   };
-    
+
   testScript =
     ''
       startAll;
-      
+
       $postgresql->waitForJob("postgresql");
       $postgresql->mustSucceed("createdb trac");
-      
+
       $webserver->mustSucceed("mkdir -p /repos/trac");
       $webserver->mustSucceed("svnadmin create /repos/trac");
-      
-      $webserver->waitForFile("/var/trac");      
+
+      $webserver->waitForFile("/var/trac");
       $webserver->mustSucceed("mkdir -p /var/trac/projects/test");
       $webserver->mustSucceed("PYTHONPATH=${pkgs.pythonPackages.psycopg2}/lib/${pkgs.python.libPrefix}/site-packages trac-admin /var/trac/projects/test initenv Test postgres://root\@postgresql/trac svn /repos/trac");
-      
+
       $client->waitForX;
       $client->execute("konqueror http://webserver/projects/test &");
       $client->waitForWindow(qr/Test.*Konqueror/);
       $client->sleep(30); # loading takes a long time
-      
+
       $client->screenshot("screen");
     '';
 }
diff --git a/tests/xfce.nix b/tests/xfce.nix
index b9114baf370..0975cd88883 100644
--- a/tests/xfce.nix
+++ b/tests/xfce.nix
@@ -2,7 +2,7 @@
 
 {
 
-  machine = 
+  machine =
     { config, pkgs, ... }:
 
     { require = [ ./common/user-account.nix ];
@@ -11,22 +11,22 @@
 
       services.xserver.displayManager.auto.enable = true;
       services.xserver.displayManager.auto.user = "alice";
-      
+
       services.xserver.desktopManager.xfce.enable = true;
     };
 
   testScript =
     ''
-      $machine->waitForWindow(qr/Tips/);      
+      $machine->waitForWindow(qr/Tips/);
       $machine->sleep(10);
 
       # Check that logging in has given the user ownership of devices.
       $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-      
+
       $machine->succeed("su - alice -c 'DISPLAY=:0.0 Terminal &'");
       $machine->waitForWindow(qr/Terminal/);
       $machine->sleep(10);
       $machine->screenshot("screen");
     '';
-  
+
 }