git.iko.soy/typeable/nixpkgs
on master help sign in
nixosTests.keymap: Port to python
commit5ae9820ea4f90fc4966837ec1cd577dcd469ead7 authorJacek Galowicz <jacek.galowicz@cyberus-technology.de> dateSun 26 Jan 2020, 18:17 (7 years ago) parent8f6f418
1 file changed+66−48
nixos/tests/keymap.nix+66−48
nixos/tests/keymap.nix+66−48
@@ -3,14 +3,13 @@
33 pkgs ? import ../.. { inherit system config; }
44}:
55
6−with import ../lib/testing.nix { inherit system pkgs; };
6+with import ../lib/testing-python.nix { inherit system pkgs; };
77
88let
99 readyFile = "/tmp/readerReady";
1010 resultFile = "/tmp/readerResult";
1111
1212 testReader = pkgs.writeScript "test-input-reader" ''
13− #!${pkgs.stdenv.shell}
1413 rm -f ${resultFile} ${resultFile}.tmp
1514 logger "testReader: START: Waiting for $1 characters, expecting '$2'."
1615 touch ${readyFile}
@@ -27,56 +26,75 @@ let
2726 '';
2827
2928
30− mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let
31− combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests);
32− perlStr = val: "'${escape ["'" "\\"] val}'";
33− lq = length combinedTests.qwerty;
34− le = length combinedTests.expect;
35− msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!";
36− send = concatMapStringsSep ", " perlStr combinedTests.qwerty;
37− expect = if (lq == le) then concatStrings combinedTests.expect else throw msg;
38−
39− in makeTest {
29+ mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; makeTest {
4030 name = "keymap-${layout}";
4131
32+ machine.console.keyMap = mkOverride 900 layout;
4233 machine.services.xserver.desktopManager.xterm.enable = false;
43− machine.i18n.consoleKeyMap = mkOverride 900 layout;
4434 machine.services.xserver.layout = mkOverride 900 layout;
4535 machine.imports = [ ./common/x11.nix extraConfig ];
4636
4737 testScript = ''
48−
49− sub mkTest ($$) {
50− my ($desc, $cmd) = @_;
51−
52− subtest $desc, sub {
53− # prepare and start testReader
54− $machine->execute("rm -f ${readyFile} ${resultFile}");
55− $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & ));
56−
57− if ($desc eq "Xorg keymap") {
58− # make sure the xterm window is open and has focus
59− $machine->waitForWindow(qr/testterm/);
60− $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync");
61− }
62−
63− # wait for reader to be ready
64− $machine->waitForFile("${readyFile}");
65− $machine->sleep(1);
66−
67− # send all keys
68− foreach ((${send})) { $machine->sendKeys($_); };
69−
70− # wait for result and check
71− $machine->waitForFile("${resultFile}");
72− $machine->succeed("grep -q 'PASS:' ${resultFile}");
73− };
74− };
75−
76− $machine->waitForX;
77−
78− mkTest "VT keymap", "openvt -sw --";
79− mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e";
38+ import json
39+ import shlex
40+
41+
42+ def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected):
43+ with subtest(test_case_name):
44+ assert len(inputs) == len(expected)
45+ machine.execute("rm -f ${readyFile} ${resultFile}")
46+
47+ # set up process that expects all the keys to be entered
48+ machine.succeed(
49+ "{} {} {} {} &".format(
50+ cmd,
51+ "${testReader}",
52+ len(inputs),
53+ shlex.quote("".join(expected)),
54+ )
55+ )
56+
57+ if xorg_keymap:
58+ # make sure the xterm window is open and has focus
59+ machine.wait_for_window("testterm")
60+ machine.wait_until_succeeds(
61+ "${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible "
62+ "--class testterm windowfocus --sync"
63+ )
64+
65+ # wait for reader to be ready
66+ machine.wait_for_file("${readyFile}")
67+ machine.sleep(1)
68+
69+ # send all keys
70+ for key in inputs:
71+ machine.send_key(key)
72+
73+ # wait for result and check
74+ machine.wait_for_file("${resultFile}")
75+ machine.succeed("grep -q 'PASS:' ${resultFile}")
76+
77+
78+ with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file:
79+ tests = json.load(json_file)
80+
81+ keymap_environments = {
82+ "VT Keymap": "openvt -sw --",
83+ "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e",
84+ }
85+
86+ machine.wait_for_x()
87+
88+ for keymap_env_name, command in keymap_environments.items():
89+ with subtest(keymap_env_name):
90+ for test_case_name, test_data in tests.items():
91+ run_test_case(
92+ command,
93+ False,
94+ test_case_name,
95+ test_data["qwerty"],
96+ test_data["expect"],
97+ )
8098 '';
8199 };
82100
@@ -89,7 +107,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
89107 altgr.expect = [ "~" "#" "{" "[" "|" ];
90108 };
91109
92− extraConfig.i18n.consoleKeyMap = "azerty/fr";
110+ extraConfig.console.keyMap = "azerty/fr";
93111 extraConfig.services.xserver.layout = "fr";
94112 };
95113
@@ -99,7 +117,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
99117 homerow.expect = [ "a" "r" "s" "t" "n" "e" "i" "o" ];
100118 };
101119
102− extraConfig.i18n.consoleKeyMap = "colemak/colemak";
120+ extraConfig.console.keyMap = "colemak/colemak";
103121 extraConfig.services.xserver.layout = "us";
104122 extraConfig.services.xserver.xkbVariant = "colemak";
105123 };
@@ -151,7 +169,7 @@ in pkgs.lib.mapAttrs mkKeyboardTest {
151169 altgr.expect = [ "@" "|" "{" "[" "]" "}" ];
152170 };
153171
154− extraConfig.i18n.consoleKeyMap = "de";
172+ extraConfig.console.keyMap = "de";
155173 extraConfig.services.xserver.layout = "de";
156174 };
157175}