diff options
author | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-10-11 23:20:57 +0200 |
---|---|---|
committer | c0bw3b <c0bw3b@users.noreply.github.com> | 2019-10-11 23:20:57 +0200 |
commit | 1f7455cf0d131b10a3f3e0b72a87bde14ea892c3 (patch) | |
tree | 0e321339d00fcfe686821bab9a60b8ed0022cd02 | |
parent | 74008e2c3c06c1526bae722529ce929078c54eb0 (diff) | |
download | nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar.gz nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar.bz2 nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar.lz nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar.xz nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.tar.zst nixpkgs-1f7455cf0d131b10a3f3e0b72a87bde14ea892c3.zip |
nixos.tests: silence getfacl absolute path message
Default getfacl behavior is to remove leading slash on absolute paths in its header printed to stdout. Before the header it will also print a message about it... Switches -p -or --absolute-names can turn this off and remove some noise from our tests logs.
-rw-r--r-- | nixos/tests/gnome3-xorg.nix | 2 | ||||
-rw-r--r-- | nixos/tests/gnome3.nix | 2 | ||||
-rw-r--r-- | nixos/tests/login.nix | 6 | ||||
-rw-r--r-- | nixos/tests/pantheon.nix | 2 | ||||
-rw-r--r-- | nixos/tests/plasma5.nix | 2 | ||||
-rw-r--r-- | nixos/tests/xfce.nix | 2 | ||||
-rw-r--r-- | nixos/tests/xfce4-14.nix | 4 |
7 files changed, 10 insertions, 10 deletions
diff --git a/nixos/tests/gnome3-xorg.nix b/nixos/tests/gnome3-xorg.nix index f12361da037..eb4c376319b 100644 --- a/nixos/tests/gnome3-xorg.nix +++ b/nixos/tests/gnome3-xorg.nix @@ -29,7 +29,7 @@ import ./make-test.nix ({ pkgs, ...} : { $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("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'"); $machine->succeed("xauth merge ~alice/.Xauthority"); diff --git a/nixos/tests/gnome3.nix b/nixos/tests/gnome3.nix index b6fe602a732..ab363efb6a1 100644 --- a/nixos/tests/gnome3.nix +++ b/nixos/tests/gnome3.nix @@ -44,7 +44,7 @@ import ./make-test.nix ({ pkgs, ...} : { $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("getfacl -p /dev/snd/timer | grep -q alice"); # Wait for the wayland server $machine->waitForFile("/run/user/1000/wayland-0"); diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix index 2a7c063d303..bd8ed23a7b8 100644 --- a/nixos/tests/login.nix +++ b/nixos/tests/login.nix @@ -48,12 +48,12 @@ import ./make-test.nix ({ pkgs, latestKernel ? false, ... }: # Check whether systemd gives and removes device ownership as # needed. subtest "device permissions", sub { - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->sendKeys("alt-f1"); $machine->waitUntilSucceeds("[ \$(fgconsole) = 1 ]"); - $machine->fail("getfacl /dev/snd/timer | grep -q alice"); + $machine->fail("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("chvt 2"); - $machine->waitUntilSucceeds("getfacl /dev/snd/timer | grep -q alice"); + $machine->waitUntilSucceeds("getfacl -p /dev/snd/timer | grep -q alice"); }; # Log out. diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index c50f77f8617..9888887ee8b 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -42,7 +42,7 @@ import ./make-test.nix ({ pkgs, ...} : $machine->waitForWindow(qr/plank/); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); # Open elementary terminal $machine->execute("su - alice -c 'DISPLAY=:0.0 io.elementary.terminal &'"); diff --git a/nixos/tests/plasma5.nix b/nixos/tests/plasma5.nix index 88d4ff33436..614fc9bf316 100644 --- a/nixos/tests/plasma5.nix +++ b/nixos/tests/plasma5.nix @@ -48,7 +48,7 @@ import ./make-test.nix ({ pkgs, ...} : $machine->waitForWindow("^Desktop "); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->execute("su - alice -c 'DISPLAY=:0.0 dolphin &'"); $machine->waitForWindow(" Dolphin"); diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix index 6cb4fae2021..7ff623062d9 100644 --- a/nixos/tests/xfce.nix +++ b/nixos/tests/xfce.nix @@ -32,7 +32,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->sleep(10); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'"); $machine->waitForWindow(qr/Terminal/); diff --git a/nixos/tests/xfce4-14.nix b/nixos/tests/xfce4-14.nix index 94378f0c8d3..d9b87b08437 100644 --- a/nixos/tests/xfce4-14.nix +++ b/nixos/tests/xfce4-14.nix @@ -14,7 +14,7 @@ import ./make-test.nix ({ pkgs, ...} : { services.xserver.desktopManager.xfce4-14.enable = true; hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then - + virtualisation.memorySize = 1024; }; @@ -27,7 +27,7 @@ import ./make-test.nix ({ pkgs, ...} : { $machine->sleep(10); # Check that logging in has given the user ownership of devices. - $machine->succeed("getfacl /dev/snd/timer | grep -q alice"); + $machine->succeed("getfacl -p /dev/snd/timer | grep -q alice"); $machine->succeed("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'"); $machine->waitForWindow(qr/Terminal/); |