nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-27 09:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/tests/keymap: cleanup, maybe fix (#349701)

Browse Source
This commit is contained in:
K900 2024-10-19 09:37:03 +03:00 committed by GitHub
commit 540a1b5184
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 28 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
nixos/tests/keymap.nix
View File

@ -11,15 +11,15 @@ let
testReader = pkgs.writeScript "test-input-reader" '' testReader = pkgs.writeScript "test-input-reader" ''
rm -f ${resultFile} ${resultFile}.tmp rm -f ${resultFile} ${resultFile}.tmp
logger "testReader: START: Waiting for $1 characters, expecting '$2'." logger "testReader: START: expecting '$1'."
touch ${readyFile} touch ${readyFile}
read -r -N $1 chars read -r -N ''${#1} -t 60 chars
rm -f ${readyFile} rm -f ${readyFile}
if [ "$chars" == "$2" ]; then if [ "$chars" == "$1" ]; then
logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp logger -s "testReader: PASS: Got '$1' as expected." 2>${resultFile}.tmp
else else
logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp logger -s "testReader: FAIL: Expected '$1' but got '$chars'." 2>${resultFile}.tmp
fi fi
# rename after the file is written to prevent a race condition # rename after the file is written to prevent a race condition
mv ${resultFile}.tmp ${resultFile} mv ${resultFile}.tmp ${resultFile}
@ -39,39 +39,29 @@ let
import shlex import shlex
def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected): def run_test_case(cmd, inputs, expected):
with subtest(test_case_name): assert len(inputs) == len(expected)
assert len(inputs) == len(expected) machine.execute("rm -f ${readyFile} ${resultFile}")
machine.execute("rm -f ${readyFile} ${resultFile}")
# set up process that expects all the keys to be entered # set up process that expects all the keys to be entered
machine.succeed( machine.succeed(
"{} {} {} {} >&2 &".format( "${pkgs.systemd}/bin/systemd-cat -t input-test-reader -- {} {} {} &".format(
cmd, cmd,
"${testReader}", "${testReader}",
len(inputs), shlex.quote("".join(expected)),
shlex.quote("".join(expected)),
)
) )
)
if xorg_keymap: # wait for reader to be ready
# make sure the xterm window is open and has focus machine.wait_for_file("${readyFile}")
machine.wait_for_window("testterm")
machine.wait_until_succeeds(
"${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible "
"--class testterm windowfocus --sync"
)
# wait for reader to be ready # send all keys
machine.wait_for_file("${readyFile}") for key in inputs:
machine.send_key(key)
# send all keys # wait for result and check
for key in inputs: machine.wait_for_file("${resultFile}")
machine.send_key(key) machine.succeed("grep -q 'PASS:' ${resultFile}")
# wait for result and check
machine.wait_for_file("${resultFile}")
machine.succeed("grep -q 'PASS:' ${resultFile}")
with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file:
@ -87,19 +77,17 @@ let
# fighting over the virtual terminal. This does not appear to be a problem # fighting over the virtual terminal. This does not appear to be a problem
# when the X test runs first. # when the X test runs first.
keymap_environments = { keymap_environments = {
"Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", "Xorg Keymap": "env DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e",
"VT Keymap": "openvt -sw --", "VT Keymap": "openvt -c 2 -sw --",
} }
machine.wait_for_x() machine.wait_for_x()
for keymap_env_name, command in keymap_environments.items(): for test_case_name, test_data in tests.items():
with subtest(keymap_env_name): for keymap_env_name, command in keymap_environments.items():
for test_case_name, test_data in tests.items(): with subtest(f"{test_case_name} - {keymap_env_name}"):
run_test_case( run_test_case(
command, command,
False,
test_case_name,
test_data["qwerty"], test_data["qwerty"],
test_data["expect"], test_data["expect"],
) )