summary refs log tree commit diff
path: root/nixos/tests/xfce.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/xfce.nix
parent1541fa351b4d664c51dddaeaa67ee0652892f405 (diff)
downloadnixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar
nixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.gz
nixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.bz2
nixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.lz
nixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.xz
nixpkgs-9153d8ed640e4df38422cad89a72a43c9df9f057.tar.zst
nixpkgs-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/xfce.nix')
-rw-r--r--nixos/tests/xfce.nix2
1 files changed, 2 insertions, 0 deletions
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index c131ef7dc8c..9f1f997db5f 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -20,6 +20,8 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript =
     ''
       $machine->waitForX;
+      $machine->waitForFile("/home/alice/.Xauthority");
+      $machine->succeed("xauth merge ~alice/.Xauthority");
       $machine->waitForWindow(qr/xfce4-panel/);
       $machine->sleep(10);