mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-11 15:08:33 +01:00
Merge pull request #73136 from worldofpeace/port-sddm-test
nixosTests.sddm: port to python
This commit is contained in:
commit
ea288463db
|
@ -3,7 +3,7 @@
|
||||||
pkgs ? import ../.. { inherit system config; }
|
pkgs ? import ../.. { inherit system config; }
|
||||||
}:
|
}:
|
||||||
|
|
||||||
with import ../lib/testing.nix { inherit system pkgs; };
|
with import ../lib/testing-python.nix { inherit system pkgs; };
|
||||||
|
|
||||||
let
|
let
|
||||||
inherit (pkgs) lib;
|
inherit (pkgs) lib;
|
||||||
|
@ -26,13 +26,13 @@ let
|
||||||
testScript = { nodes, ... }: let
|
testScript = { nodes, ... }: let
|
||||||
user = nodes.machine.config.users.users.alice;
|
user = nodes.machine.config.users.users.alice;
|
||||||
in ''
|
in ''
|
||||||
startAll;
|
start_all()
|
||||||
$machine->waitForText(qr/select your user/i);
|
machine.wait_for_text("select your user")
|
||||||
$machine->screenshot("sddm");
|
machine.screenshot("sddm")
|
||||||
$machine->sendChars("${user.password}\n");
|
machine.send_chars("${user.password}\n")
|
||||||
$machine->waitForFile("/home/alice/.Xauthority");
|
machine.wait_for_file("${user.home}/.Xauthority")
|
||||||
$machine->succeed("xauth merge ~alice/.Xauthority");
|
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||||
$machine->waitForWindow("^IceWM ");
|
machine.wait_for_window("^IceWM ")
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -57,11 +57,13 @@ let
|
||||||
services.xserver.desktopManager.default = "none";
|
services.xserver.desktopManager.default = "none";
|
||||||
};
|
};
|
||||||
|
|
||||||
testScript = { ... }: ''
|
testScript = { nodes, ... }: let
|
||||||
startAll;
|
user = nodes.machine.config.users.users.alice;
|
||||||
$machine->waitForFile("/home/alice/.Xauthority");
|
in ''
|
||||||
$machine->succeed("xauth merge ~alice/.Xauthority");
|
start_all()
|
||||||
$machine->waitForWindow("^IceWM ");
|
machine.wait_for_file("${user.home}/.Xauthority")
|
||||||
|
machine.succeed("xauth merge ${user.home}/.Xauthority")
|
||||||
|
machine.wait_for_window("^IceWM ")
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue