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: a08e4908e2a6
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 6b1bc176f4cc
Choose a head ref
  • 3 commits
  • 3 files changed
  • 2 contributors

Commits on May 10, 2018

  1. nixos/tests/plotinus: fix non-deterministic failure (#40239) 

    Test failed sometimes, likely because a window didn't get focus.

(cherry picked from commit 558f4b3)
    @xeji
    xeji committed May 10, 2018
    Copy the full SHA
    f1e419f View commit details

  2. nixos/release-combined.nix: make tests consistent (#40131) 

    ... with release-small.nix
Tests for small channel should be a subset of tests for full channel.

(cherry picked from commit f8d047d)
    @xeji
    xeji committed May 10, 2018
    Copy the full SHA
    e5be49a View commit details

  3. nixos/tests/fleet: disable test 

    test fails, package broken, was dropped on master
    @xeji
    xeji committed May 10, 2018
    Copy the full SHA
    6b1bc17 View commit details
Showing with 10 additions and 6 deletions.
  1. +4 −0 nixos/release-combined.nix
  2. +1 −1 nixos/release.nix
  3. +5 −5 nixos/tests/plotinus.nix
4 changes: 4 additions & 0 deletions nixos/release-combined.nix
View file
Original file line number Diff line number Diff line change
@@ -58,6 +58,8 @@ in rec {
nixos.ova.x86_64-linux or []

#(all nixos.tests.containers)
(all nixos.tests.containers-imperative)
(all nixos.tests.containers-ipv4)
nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox)
(all nixos.tests.firewall)
@@ -98,6 +100,7 @@ in rec {
(all nixos.tests.misc)
(all nixos.tests.mutableUsers)
(all nixos.tests.nat.firewall)
(all nixos.tests.nat.firewall-conntrack)
(all nixos.tests.nat.standalone)
(all nixos.tests.networking.scripted.loopback)
(all nixos.tests.networking.scripted.static)
@@ -112,6 +115,7 @@ in rec {
(all nixos.tests.nfs4)
(all nixos.tests.openssh)
(all nixos.tests.php-pcre)
(all nixos.tests.predictable-interface-names)
(all nixos.tests.printing)
(all nixos.tests.proxy)
(all nixos.tests.sddm.default)
2 changes: 1 addition & 1 deletion nixos/release.nix
View file
Original file line number Diff line number Diff line change
@@ -278,7 +278,7 @@ in rec {
tests.ferm = callTest tests/ferm.nix {};
tests.firefox = callTest tests/firefox.nix {};
tests.firewall = callTest tests/firewall.nix {};
tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
#tests.fleet = callTestOnMatchingSystems ["x86_64-linux"] tests/fleet.nix {};
tests.fwupd = callTest tests/fwupd.nix {};
#tests.gitlab = callTest tests/gitlab.nix {};
tests.gitolite = callTest tests/gitolite.nix {};
10 changes: 5 additions & 5 deletions nixos/tests/plotinus.nix
View file
Original file line number Diff line number Diff line change
@@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: {
testScript =
''
$machine->waitForX;
$machine->execute("xterm -e 'gnome-calculator' &");
$machine->waitForWindow(qr/Calculator/);
$machine->execute("xdotool key ctrl+shift+p");
$machine->sleep(1); # wait for the popup
$machine->execute("xdotool key p r e f e r e n c e s Return");
$machine->succeed("gnome-calculator &");
$machine->waitForWindow(qr/gnome-calculator/);
$machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p");
$machine->sleep(5); # wait for the popup
$machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return");
$machine->waitForWindow(qr/Preferences/);
$machine->screenshot("screen");
'';