Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: c20f765bb489
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 4414a3bc7cbe
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Nov 20, 2019

  1. nixosTests.xfce: port to python

    @worldofpeace
    worldofpeace committed Nov 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    a72f8a3 View commit details

  2. Merge pull request #73138 from worldofpeace/port-xfce-tests 

    Port xfce test to python
    @worldofpeace
    worldofpeace authored Nov 20, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    4414a3b View commit details
Showing with 14 additions and 13 deletions.
  1. +14 −13 nixos/tests/xfce.nix
27 changes: 14 additions & 13 deletions nixos/tests/xfce.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, ...} : {
name = "xfce";

machine =
@@ -18,20 +18,21 @@ import ./make-test.nix ({ pkgs, ...} : {
virtualisation.memorySize = 1024;
};

testScript =
''
$machine->waitForX;
$machine->waitForFile("/home/alice/.Xauthority");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/xfce4-panel/);
$machine->sleep(10);
testScript = { nodes, ... }: let
user = nodes.machine.config.users.users.alice;
in ''
machine.wait_for_x()
machine.wait_for_file("${user.home}/.Xauthority")
machine.succeed("xauth merge ${user.home}/.Xauthority")
machine.wait_for_window("xfce4-panel")
machine.sleep(10)
# Check that logging in has given the user ownership of devices.
$machine->succeed("getfacl -p /dev/snd/timer | grep -q alice");
machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
$machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
$machine->waitForWindow(qr/Terminal/);
$machine->sleep(10);
$machine->screenshot("screen");
machine.succeed("su - ${user.name} -c 'DISPLAY=:0.0 xfce4-terminal &'")
machine.wait_for_window("Terminal")
machine.sleep(10)
machine.screenshot("screen")
'';
})