JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixosTests: remove xfce4-14 test

Browse Source
This commit is contained in:
worldofpeace 2019-11-04 16:41:42 -05:00
parent 04e56aa016
commit b64a77de32
4 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/release-combined.nix
View File

@ -136,7 +136,6 @@ in rec {
(all nixos.tests.switchTest) (all nixos.tests.switchTest)
(all nixos.tests.udisks2) (all nixos.tests.udisks2)
(all nixos.tests.xfce) (all nixos.tests.xfce)
(all nixos.tests.xfce4-14)
nixpkgs.tarball nixpkgs.tarball
(all allSupportedNixpkgs.emacs) (all allSupportedNixpkgs.emacs)

1
nixos/tests/all-tests.nix
View File

@ -284,7 +284,6 @@ in
wordpress = handleTest ./wordpress.nix {}; wordpress = handleTest ./wordpress.nix {};
xautolock = handleTest ./xautolock.nix {}; xautolock = handleTest ./xautolock.nix {};
xfce = handleTest ./xfce.nix {}; xfce = handleTest ./xfce.nix {};
xfce4-14 = handleTest ./xfce4-14.nix {};
xmonad = handleTest ./xmonad.nix {}; xmonad = handleTest ./xmonad.nix {};
xrdp = handleTest ./xrdp.nix {}; xrdp = handleTest ./xrdp.nix {};
xss-lock = handleTest ./xss-lock.nix {}; xss-lock = handleTest ./xss-lock.nix {};

9
nixos/tests/xfce.nix
View File

@ -1,8 +1,5 @@
import ./make-test.nix ({ pkgs, ...} : { import ./make-test.nix ({ pkgs, ...} : {
name = "xfce"; name = "xfce";
meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco shlevy ];
};
machine = machine =
{ pkgs, ... }: { pkgs, ... }:
@ -16,8 +13,6 @@ import ./make-test.nix ({ pkgs, ...} : {
services.xserver.desktopManager.xfce.enable = true; services.xserver.desktopManager.xfce.enable = true;
environment.systemPackages = [ pkgs.xorg.xmessage ];
hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then hardware.pulseaudio.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
virtualisation.memorySize = 1024; virtualisation.memorySize = 1024;
@ -38,9 +33,5 @@ import ./make-test.nix ({ pkgs, ...} : {
$machine->waitForWindow(qr/Terminal/); $machine->waitForWindow(qr/Terminal/);
$machine->sleep(10); $machine->sleep(10);
$machine->screenshot("screen"); $machine->screenshot("screen");
# Ensure that the X server does proper access control.
$machine->mustFail("su - bob -c 'DISPLAY=:0.0 xmessage Foo'");
$machine->mustFail("su - bob -c 'DISPLAY=:0 xmessage Foo'");
''; '';
}) })

37
nixos/tests/xfce4-14.nix
View File

@ -1,37 +0,0 @@
import ./make-test.nix ({ pkgs, ...} : {
name = "xfce4-14";
machine =
{ pkgs, ... }:
{ imports = [ ./common/user-account.nix ];
services.xserver.enable = true;
services.xserver.displayManager.auto.enable = true;
services.xserver.displayManager.auto.user = "alice";
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;
};
testScript =
''
$machine->waitForX;
$machine->waitForFile("/home/alice/.Xauthority");
$machine->succeed("xauth merge ~alice/.Xauthority");
$machine->waitForWindow(qr/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("su - alice -c 'DISPLAY=:0.0 xfce4-terminal &'");
$machine->waitForWindow(qr/Terminal/);
$machine->sleep(10);
$machine->screenshot("screen");
'';
})