NixOS/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-09 17:46:29 +09:00
Code Activity

nixosTests.xterm: migrate to runTest

Browse source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 23:03:42 +01:00
parent 7c1bc83f56
commit 20ad3329fe
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 21 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1296,7 +1296,7 @@ in {
xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {}; xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {};
xscreensaver = handleTest ./xscreensaver.nix {}; xscreensaver = handleTest ./xscreensaver.nix {};
xss-lock = handleTest ./xss-lock.nix {}; xss-lock = handleTest ./xss-lock.nix {};
xterm = handleTest ./xterm.nix {}; xterm = runTest ./xterm.nix;
xxh = runTest ./xxh.nix; xxh = runTest ./xxh.nix;
yabar = runTest ./yabar.nix; yabar = runTest ./yabar.nix;
ydotool = handleTest ./ydotool.nix {}; ydotool = handleTest ./ydotool.nix {};

44
nixos/tests/xterm.nix
View file

@ -1,26 +1,22 @@
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: {
{ name = "xterm";
name = "xterm"; meta = with pkgs.lib.maintainers; {
meta = with pkgs.lib.maintainers; { maintainers = [ nequissimus ];
maintainers = [ nequissimus ]; };
};
nodes.machine = nodes.machine = {
{ pkgs, ... }: imports = [ ./common/x11.nix ];
{ services.xserver.desktopManager.xterm.enable = false;
imports = [ ./common/x11.nix ]; };
services.xserver.desktopManager.xterm.enable = false;
};
testScript = '' testScript = ''
machine.wait_for_x() machine.wait_for_x()
machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &") machine.succeed("DISPLAY=:0 xterm -title testterm -class testterm -fullscreen >&2 &")
machine.sleep(2) machine.sleep(2)
machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n") machine.send_chars("echo $XTERM_VERSION >> /tmp/xterm_version\n")
machine.wait_for_file("/tmp/xterm_version") machine.wait_for_file("/tmp/xterm_version")
assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version") assert "${pkgs.xterm.version}" in machine.succeed("cat /tmp/xterm_version")
machine.screenshot("window") machine.screenshot("window")
''; '';
} }
)