diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 21ef7545a853..9f06d7040844 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1290,7 +1290,7 @@ in { xfce = handleTest ./xfce.nix {}; xfce-wayland = handleTest ./xfce-wayland.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; xrdp = runTest ./xrdp.nix; xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix; diff --git a/nixos/tests/xmonad-xdg-autostart.nix b/nixos/tests/xmonad-xdg-autostart.nix index 419b3e413a08..76ea97c6a0c1 100644 --- a/nixos/tests/xmonad-xdg-autostart.nix +++ b/nixos/tests/xmonad-xdg-autostart.nix @@ -1,44 +1,42 @@ -import ./make-test-python.nix ( - { lib, ... }: - { - name = "xmonad-xdg-autostart"; - meta.maintainers = with lib.maintainers; [ oxalica ]; +{ lib, ... }: +{ + name = "xmonad-xdg-autostart"; + meta.maintainers = with lib.maintainers; [ oxalica ]; - nodes.machine = - { pkgs, config, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix - ]; - test-support.displayManager.auto.user = "alice"; - services.displayManager.defaultSession = "none+xmonad"; - services.xserver.windowManager.xmonad.enable = true; - services.xserver.desktopManager.runXdgAutostartIfNone = true; + nodes.machine = + { pkgs, config, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; + services.displayManager.defaultSession = "none+xmonad"; + services.xserver.windowManager.xmonad.enable = true; + services.xserver.desktopManager.runXdgAutostartIfNone = true; - environment.systemPackages = [ - (pkgs.writeTextFile { - name = "test-xdg-autostart"; - destination = "/etc/xdg/autostart/test-xdg-autostart.desktop"; - text = '' - [Desktop Entry] - Name=test-xdg-autoatart - Type=Application - Terminal=false - Exec=${pkgs.coreutils}/bin/touch ${config.users.users.alice.home}/xdg-autostart-executed - ''; - }) - ]; - }; + environment.systemPackages = [ + (pkgs.writeTextFile { + name = "test-xdg-autostart"; + destination = "/etc/xdg/autostart/test-xdg-autostart.desktop"; + text = '' + [Desktop Entry] + Name=test-xdg-autoatart + Type=Application + Terminal=false + Exec=${pkgs.coreutils}/bin/touch ${config.users.users.alice.home}/xdg-autostart-executed + ''; + }) + ]; + }; - testScript = - { nodes, ... }: - let - user = nodes.machine.config.users.users.alice; - in - '' - machine.wait_for_x() - machine.wait_for_file("${user.home}/xdg-autostart-executed") - ''; - } -) + testScript = + { nodes, ... }: + let + user = nodes.machine.users.users.alice; + in + '' + machine.wait_for_x() + machine.wait_for_file("${user.home}/xdg-autostart-executed") + ''; +}