talexander/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

nixosTests.xmonad-xdg-autostart: migrate to runTest

Browse Source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 23:20:54 +01:00
parent 6a13f858bd
commit 4ada7d8158
No known key found for this signature in database
GPG Key ID: 87C1E9888F856759
2 changed files with 40 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1290,7 +1290,7 @@ in {
xfce = handleTest ./xfce.nix {}; xfce = handleTest ./xfce.nix {};
xfce-wayland = handleTest ./xfce-wayland.nix {}; xfce-wayland = handleTest ./xfce-wayland.nix {};
xmonad = handleTest ./xmonad.nix {}; xmonad = handleTest ./xmonad.nix {};
xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {}; xmonad-xdg-autostart = runTest ./xmonad-xdg-autostart.nix;
xpadneo = runTest ./xpadneo.nix; xpadneo = runTest ./xpadneo.nix;
xrdp = runTest ./xrdp.nix; xrdp = runTest ./xrdp.nix;
xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix; xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix;

80
nixos/tests/xmonad-xdg-autostart.nix
View File

@ -1,44 +1,42 @@
import ./make-test-python.nix ( { lib, ... }:
{ lib, ... }: {
{ name = "xmonad-xdg-autostart";
name = "xmonad-xdg-autostart"; meta.maintainers = with lib.maintainers; [ oxalica ];
meta.maintainers = with lib.maintainers; [ oxalica ];
nodes.machine = nodes.machine =
{ pkgs, config, ... }: { pkgs, config, ... }:
{ {
imports = [ imports = [
./common/x11.nix ./common/x11.nix
./common/user-account.nix ./common/user-account.nix
]; ];
test-support.displayManager.auto.user = "alice"; test-support.displayManager.auto.user = "alice";
services.displayManager.defaultSession = "none+xmonad"; services.displayManager.defaultSession = "none+xmonad";
services.xserver.windowManager.xmonad.enable = true; services.xserver.windowManager.xmonad.enable = true;
services.xserver.desktopManager.runXdgAutostartIfNone = true; services.xserver.desktopManager.runXdgAutostartIfNone = true;
environment.systemPackages = [ environment.systemPackages = [
(pkgs.writeTextFile { (pkgs.writeTextFile {
name = "test-xdg-autostart"; name = "test-xdg-autostart";
destination = "/etc/xdg/autostart/test-xdg-autostart.desktop"; destination = "/etc/xdg/autostart/test-xdg-autostart.desktop";
text = '' text = ''
[Desktop Entry] [Desktop Entry]
Name=test-xdg-autoatart Name=test-xdg-autoatart
Type=Application Type=Application
Terminal=false Terminal=false
Exec=${pkgs.coreutils}/bin/touch ${config.users.users.alice.home}/xdg-autostart-executed Exec=${pkgs.coreutils}/bin/touch ${config.users.users.alice.home}/xdg-autostart-executed
''; '';
}) })
]; ];
}; };
testScript = testScript =
{ nodes, ... }: { nodes, ... }:
let let
user = nodes.machine.config.users.users.alice; user = nodes.machine.users.users.alice;
in in
'' ''
machine.wait_for_x() machine.wait_for_x()
machine.wait_for_file("${user.home}/xdg-autostart-executed") machine.wait_for_file("${user.home}/xdg-autostart-executed")
''; '';
} }
)