@@ -1,9 +1,10 @@
1−import ./make-test.nix ({ pkgs, ...} :
1+import ./make-test-python.nix ({ pkgs, ...} :
22
33{
44 name = "pantheon";
5+
56 meta = with pkgs.stdenv.lib.maintainers; {
6− maintainers = [ worldofpeace ];
7+ maintainers = pkgs.pantheon.maintainers;
78 };
89
910 machine = { ... }:
@@ -23,35 +24,35 @@ import ./make-test.nix ({ pkgs, ...} :
2324 user = nodes.machine.config.users.users.alice;
2425 in ''
2526 # Wait for display manager to start
26− $machine->waitForUnit("display-manager.service");
27+ machine.wait_for_unit("display-manager.service")
2728
2829 # Test we can see username in elementary-greeter
29− $machine->waitForText(qr/${user.description}/);
30− $machine->screenshot("elementary_greeter_lightdm");
31−
32− # Log in
33− $machine->sendChars("${user.password}\n");
34− $machine->waitForUnit("default.target","alice");
35− $machine->waitForFile("${user.home}/.Xauthority");
36− $machine->succeed("xauth merge ${user.home}/.Xauthority");
37−
38− # Check if "pantheon-shell" components actually start
39− $machine->waitUntilSucceeds("pgrep gala");
40− $machine->waitForWindow(qr/gala/);
41− $machine->waitUntilSucceeds("pgrep wingpanel");
42− $machine->waitForWindow("wingpanel");
43− $machine->waitUntilSucceeds("pgrep plank");
44− $machine->waitForWindow(qr/plank/);
45−
46− # Check that logging in has given the user ownership of devices.
47− $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
30+ machine.wait_for_text("${user.description}")
31+ machine.screenshot("elementary_greeter_lightdm")
32+
33+ # Log in with elementary-greeter
34+ machine.send_chars("${user.password}\n")
35+ machine.wait_for_unit("default.target", "${user.name}")
36+ machine_wait_for_x()
37+ machine.wait_for_file("${user.home}/.Xauthority")
38+ machine.succeed("xauth merge ${user.home}/.Xauthority")
39+
40+ # Check that logging in has given the user ownership of devices
41+ machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
42+
43+ # TODO: DBus API could eliminate this?
44+ # Check if pantheon-shell components actually start
45+ machine.wait_until_succeeds("pgrep gala")
46+ machine.wait_for_window("gala")
47+ machine.wait_until_succeeds("pgrep wingpanel")
48+ machine.wait_for_window("wingpanel")
49+ machine.wait_until_succeeds("pgrep plank")
50+ machine.wait_for_window("plank")
4851
4952 # Open elementary terminal
50− $machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'");
51− $machine->waitForWindow(qr/io.elementary.terminal/);
52−
53− # Take a screenshot of the desktop
54− $machine->sleep(20);
55− $machine->screenshot("screen");
53+ machine.execute("su - ${user.name} -c 'DISPLAY=:0 io.elementary.terminal &'")
54+ machine.wait_for_window("io.elementary.terminal")
55+ machine.sleep(20)
56+ machine.screenshot("screen")
5657 '';
5758})