about summary refs log tree commit diff
path: root/nixos/tests
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-11-10 23:05:51 +0000
committerGitHub <noreply@github.com>2019-11-10 23:05:51 +0000
commit8cf9315425f7ce45e96d6e9114f7dfadd3906529 (patch)
tree6e014adde3b97c2f810ea0bd9273f82ee3c8b224 /nixos/tests
parent027e2a255623797fabbc009513da886c6a1ce74b (diff)
parent1132f037a1fd41cc761126f9fb29a1fceb6e8a4f (diff)
downloadnixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar.gz
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar.bz2
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar.lz
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar.xz
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.tar.zst
nixlib-8cf9315425f7ce45e96d6e9114f7dfadd3906529.zip
Merge pull request #73135 from worldofpeace/port-lightdm-test
nixosTests.lightdm: port to python
Diffstat (limited to 'nixos/tests')
-rw-r--r--nixos/tests/lightdm.nix16
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix
index c805f1ed9f3c..ef30f7741e23 100644
--- a/nixos/tests/lightdm.nix
+++ b/nixos/tests/lightdm.nix
@@ -1,4 +1,4 @@
-import ./make-test.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ...} : {
   name = "lightdm";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ aszlig worldofpeace ];
@@ -18,12 +18,12 @@ import ./make-test.nix ({ pkgs, ...} : {
   testScript = { nodes, ... }: let
     user = nodes.machine.config.users.users.alice;
   in ''
-    startAll;
-    $machine->waitForText(qr/${user.description}/);
-    $machine->screenshot("lightdm");
-    $machine->sendChars("${user.password}\n");
-    $machine->waitForFile("/home/alice/.Xauthority");
-    $machine->succeed("xauth merge ~alice/.Xauthority");
-    $machine->waitForWindow("^IceWM ");
+    start_all()
+    machine.wait_for_text("${user.description}")
+    machine.screenshot("lightdm")
+    machine.send_chars("${user.password}\n")
+    machine.wait_for_file("${user.home}/.Xauthority")
+    machine.succeed("xauth merge ${user.home}/.Xauthority")
+    machine.wait_for_window("^IceWM ")
   '';
 })