diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 86e33ce5b3d6..cb712b8e2aa6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1296,7 +1296,7 @@ in { xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {}; xscreensaver = handleTest ./xscreensaver.nix {}; xss-lock = handleTest ./xss-lock.nix {}; - xterm = handleTest ./xterm.nix {}; + xterm = runTest ./xterm.nix; xxh = runTest ./xxh.nix; yabar = runTest ./yabar.nix; ydotool = handleTest ./ydotool.nix {}; diff --git a/nixos/tests/xterm.nix b/nixos/tests/xterm.nix index 52a7b431a44e..caf1780d1565 100644 --- a/nixos/tests/xterm.nix +++ b/nixos/tests/xterm.nix @@ -1,26 +1,22 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - name = "xterm"; - meta = with pkgs.lib.maintainers; { - maintainers = [ nequissimus ]; - }; +{ pkgs, ... }: +{ + name = "xterm"; + meta = with pkgs.lib.maintainers; { + maintainers = [ nequissimus ]; + }; - nodes.machine = - { pkgs, ... }: - { - imports = [ ./common/x11.nix ]; - services.xserver.desktopManager.xterm.enable = false; - }; + nodes.machine = { + imports = [ ./common/x11.nix ]; + services.xserver.desktopManager.xterm.enable = false; + }; - testScript = '' - machine.wait_for_x() - machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &") - machine.sleep(2) - machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n") - machine.wait_for_file("/tmp/xterm_version") - assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version") - machine.screenshot("window") - ''; - } -) + testScript = '' + machine.wait_for_x() + machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &") + machine.sleep(2) + machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n") + machine.wait_for_file("/tmp/xterm_version") + assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version") + machine.screenshot("window") + ''; +}