about summary refs log tree commit diff
path: root/nixos/tests/kde4.nix
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-12 19:12:47 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2016-04-12 19:13:47 +0200
commit9153d8ed640e4df38422cad89a72a43c9df9f057 (patch)
tree13ad012f954bd44233c3eba440141c2b66e9487f /nixos/tests/kde4.nix
parent1541fa351b4d664c51dddaeaa67ee0652892f405 (diff)
downloadnixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.gz
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.bz2
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.lz
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.xz
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.zst
nixlib-9153d8ed640e4df38422cad89a72a43c9df9f057.zip
Fix X11 tests broken by the removal of -ac
Probably missed a few. Also adding xauth to the system path (it was
already in the closure).
Diffstat (limited to 'nixos/tests/kde4.nix')
-rw-r--r--nixos/tests/kde4.nix6
1 files changed, 4 insertions, 2 deletions
diff --git a/nixos/tests/kde4.nix b/nixos/tests/kde4.nix
index dc61658cd1c4..2693fb4fbf0a 100644
--- a/nixos/tests/kde4.nix
+++ b/nixos/tests/kde4.nix
@@ -41,11 +41,13 @@ import ./make-test.nix ({ pkgs, ... }: {
           pkgs.kde4.kdenetwork
           pkgs.kde4.kdetoys
           pkgs.kde4.kdewebdev
+          pkgs.xorg.xmessage
         ];
     };
 
-  testScript = '' 
+  testScript = ''
       $machine->waitUntilSucceeds("pgrep plasma-desktop");
+      $machine->succeed("xauth merge ~alice/.Xauthority");
       $machine->waitForWindow(qr/plasma-desktop/);
 
       # Check that logging in has given the user ownership of devices.
@@ -62,7 +64,7 @@ import ./make-test.nix ({ pkgs, ... }: {
 
       $machine->sleep(10);
 
-      $machine->screenshot("screen"); 
+      $machine->screenshot("screen");
     '';
 
 })