@@ -22,16 +22,18 @@ import ./make-test.nix ({ pkgs, ...} :
2222 testScript = { nodes, ... }: let
2323 user = nodes.machine.config.users.users.alice;
2424 in ''
25− startAll;
26−
2725 # Wait for display manager to start
26+ $machine->waitForUnit("display-manager.service");
27+
28+ # Test we can see username in elementary-greeter
2829 $machine->waitForText(qr/${user.description}/);
29− $machine->screenshot("lightdm");
30+ $machine->screenshot("elementary_greeter_lightdm");
3031
3132 # Log in
3233 $machine->sendChars("${user.password}\n");
33− $machine->waitForFile("/home/alice/.Xauthority");
34− $machine->succeed("xauth merge ~alice/.Xauthority");
34+ $machine->waitForUnit("default.target","alice");
35+ $machine->waitForFile("${user.home}/.Xauthority");
36+ $machine->succeed("xauth merge ${user.home}/.Xauthority");
3537
3638 # Check if "pantheon-shell" components actually start
3739 $machine->waitUntilSucceeds("pgrep gala");