about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorThomas Tuegel <ttuegel@gmail.com>2016-09-09 10:09:45 -0500
committerThomas Tuegel <ttuegel@gmail.com>2016-09-09 10:12:31 -0500
commit0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469 (patch)
tree7e4b1127e9d079d8d9c86b1e63534e26ca26d1aa /nixos
parentd7f1af2fba3d9aa89cd239b60722e5134ec70e5b (diff)
downloadnixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar.gz
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar.bz2
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar.lz
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar.xz
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.tar.zst
nixlib-0fdaae8be4c170a64e9ea76ce7691aa8a9fa1469.zip
nixos/tests/sddm-kde5: don't run tests through krunner
(cherry picked from commit 1f510dc7cd1dbb67bbf6574983de1dc5ebde1a1d)
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/sddm-kde5.nix33
1 files changed, 15 insertions, 18 deletions
diff --git a/nixos/tests/sddm-kde5.nix b/nixos/tests/sddm-kde5.nix
index 0247d267aaa4..787dd2f8cbdd 100644
--- a/nixos/tests/sddm-kde5.nix
+++ b/nixos/tests/sddm-kde5.nix
@@ -24,29 +24,26 @@ import ./make-test.nix ({ pkgs, ...} :
 
   testScript = { nodes, ... }:
   let xdo = "${pkgs.xdotool}/bin/xdotool"; in
-   ''     
-    sub krunner {
-      my ($win,) = @_;
-      $machine->execute("${xdo} key Alt+F2 sleep 1 type $win");
-      $machine->execute("${xdo} search --sync --onlyvisible --class krunner sleep 5 key Return");
-    }
+   ''
+    startAll;
+
+    $machine->waitForFile("/home/alice/.Xauthority");
+    $machine->succeed("xauth merge ~alice/.Xauthority");
 
     $machine->waitUntilSucceeds("pgrep plasmashell");
-    $machine->succeed("xauth merge ~alice/.Xauthority");    
-    $machine->waitForWindow(qr/Desktop.*/);
+    $machine->waitForWindow("^Desktop ");
 
     # Check that logging in has given the user ownership of devices.
     $machine->succeed("getfacl /dev/snd/timer | grep -q alice");
-    
-    krunner("dolphin");
-    $machine->waitForWindow(qr/.*Dolphin/);
-    
-    krunner("konsole");
-    $machine->waitForWindow(qr/.*Konsole/);
-    
-    krunner("systemsettings5");
-    $machine->waitForWindow(qr/.*Settings/);
-    $machine->sleep(20);
+
+    $machine->execute("su - alice -c 'DISPLAY=:0.0 dolphin &'");
+    $machine->waitForWindow(" Dolphin");
+
+    $machine->execute("su - alice -c 'DISPLAY=:0.0 konsole &'");
+    $machine->waitForWindow("Konsole");
+
+    $machine->execute("su - alice -c 'DISPLAY=:0.0 systemsettings5 &'");
+    $machine->waitForWindow("Settings");
 
     $machine->execute("${xdo} key Alt+F1 sleep 10");
     $machine->screenshot("screen");