Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 99389f0574ef
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ef74cafd3e59
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on May 12, 2018

  1. nixos/tests/gnome3-gdm: fix broken test 

    test always failed due to multiple bugs

(cherry picked from commit 4c14202)
    @xeji
    xeji committed May 12, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    Mic92 Jörg Thalheim
    GPG key ID: CA4106B8D7CC79FA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    6b50b98 View commit details

  2. nixos/test/systemd: fix broken test 

    timing bug resulted in sporadic test failures on hydra

(cherry picked from commit 9d5af58)
    @xeji
    xeji committed May 12, 2018
    Copy the full SHA
    ef74caf View commit details
Showing with 12 additions and 3 deletions.
  1. +10 −3 nixos/tests/gnome3-gdm.nix
  2. +2 −0 nixos/tests/systemd.nix
13 changes: 10 additions & 3 deletions nixos/tests/gnome3-gdm.nix
View file
Original file line number Diff line number Diff line change
@@ -26,15 +26,22 @@ import ./make-test.nix ({ pkgs, ...} : {

testScript =
''
# wait for gdm to start and bring up X
$machine->waitForUnit("display-manager.service");
$machine->waitForX;
$machine->sleep(15);
# wait for alice to be logged in
$machine->waitForUnit("default.target","alice");
# Check that logging in has given the user ownership of devices.
$machine->succeed("getfacl /dev/snd/timer | grep -q alice");
$machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");
$machine->succeed("xauth merge ~alice/.Xauthority");
# open a terminal and check it's there
$machine->succeed("su - alice -c 'DISPLAY=:0.0 XAUTHORITY=/run/user/\$UID/gdm/Xauthority gnome-terminal'");
$machine->succeed("xauth merge /run/user/1000/gdm/Xauthority");
$machine->waitForWindow(qr/Terminal/);
# wait to get a nice screenshot
$machine->sleep(20);
$machine->screenshot("screen");
'';
2 changes: 2 additions & 0 deletions nixos/tests/systemd.nix
View file
Original file line number Diff line number Diff line change
@@ -46,6 +46,8 @@ import ./make-test.nix {

testScript = ''
$machine->waitForX;
# wait for user services
$machine->waitForUnit("default.target","alice");
# Regression test for https://github.com/NixOS/nixpkgs/issues/35415
subtest "configuration files are recognized by systemd", sub {