Merge pull request #39400 from xeji/improve-keymap-tests

nixos/tests/keymap: improve keymap tests
This commit is contained in:
Sarah Brofeldt 2018-04-24 11:49:53 +02:00 committed by GitHub
commit 65abd2e63f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -3,46 +3,34 @@
with import ../lib/testing.nix { inherit system; }; with import ../lib/testing.nix { inherit system; };
let let
readyFile = "/tmp/readerReady";
resultFile = "/tmp/readerResult";
testReader = pkgs.writeScript "test-input-reader" '' testReader = pkgs.writeScript "test-input-reader" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
readInput() { rm -f ${resultFile}
touch /tmp/reader.ready logger "testReader: START: Waiting for $1 characters, expecting '$2'."
echo "Waiting for '$1' to be typed" touch ${readyFile}
read -r -n1 c read -r -N $1 chars
if [ "$c" = "$2" ]; then rm -f ${readyFile}
echo "SUCCESS: Got back '$c' as expected."
echo 0 >&2
else
echo "FAIL: Expected '$2' but got '$c' instead."
echo 1 >&2
fi
}
main() { if [ "$chars" == "$2" ]; then
error=0 logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}
while [ $# -gt 0 ]; do else
ret="$((readInput "$2" "$3" | systemd-cat -t "$1") 2>&1)" logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}
if [ $ret -ne 0 ]; then error=1; fi fi
shift 3
done
return $error
}
main "$@"; echo -n $? > /tmp/reader.exit
''; '';
mkReaderInput = testname: { qwerty, expect }: with pkgs.lib; let
lq = length qwerty;
le = length expect;
msg = "`qwerty' (${lq}) and `expect' (${le}) lists"
+ " need to be of the same length!";
result = flatten (zipListsWith (a: b: [testname a b]) qwerty expect);
in if lq != le then throw msg else result;
mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let mkKeyboardTest = layout: { extraConfig ? {}, tests }: with pkgs.lib; let
readerInput = flatten (mapAttrsToList mkReaderInput tests); combinedTests = foldAttrs (acc: val: acc ++ val) [] (builtins.attrValues tests);
perlStr = val: "'${escape ["'" "\\"] val}'"; perlStr = val: "'${escape ["'" "\\"] val}'";
perlReaderInput = concatMapStringsSep ", " perlStr readerInput; lq = length combinedTests.qwerty;
le = length combinedTests.expect;
msg = "length mismatch between qwerty (${toString lq}) and expect (${toString le}) lists!";
send = concatMapStringsSep ", " perlStr combinedTests.qwerty;
expect = if (lq == le) then concatStrings combinedTests.expect else throw msg;
in makeTest { in makeTest {
name = "keymap-${layout}"; name = "keymap-${layout}";
@ -50,38 +38,40 @@ let
machine.i18n.consoleKeyMap = mkOverride 900 layout; machine.i18n.consoleKeyMap = mkOverride 900 layout;
machine.services.xserver.layout = mkOverride 900 layout; machine.services.xserver.layout = mkOverride 900 layout;
machine.imports = [ ./common/x11.nix extraConfig ]; machine.imports = [ ./common/x11.nix extraConfig ];
machine.services.xserver.displayManager.slim.enable = true;
testScript = '' testScript = ''
sub waitCatAndDelete ($) {
return $machine->succeed(
"for i in \$(seq 600); do if [ -e '$_[0]' ]; then ".
"cat '$_[0]' && rm -f '$_[0]' && exit 0; ".
"fi; sleep 0.1; done; echo timed out after 60 seconds >&2; exit 1"
);
};
sub mkTest ($$) { sub mkTest ($$) {
my ($desc, $cmd) = @_; my ($desc, $cmd) = @_;
my @testdata = (${perlReaderInput});
my $shellTestdata = join ' ', map { "'".s/'/'\\'''/gr."'" } @testdata;
subtest $desc, sub { subtest $desc, sub {
$machine->succeed("$cmd ${testReader} $shellTestdata &"); # prepare and start testReader
while (my ($testname, $qwerty, $expect) = splice(@testdata, 0, 3)) { $machine->execute("rm -f ${readyFile} ${resultFile}");
waitCatAndDelete "/tmp/reader.ready"; $machine->succeed("$cmd ${testReader} ${toString le} ".q(${escapeShellArg expect} & ));
$machine->sendKeys($qwerty);
}; if ($desc eq "Xorg keymap") {
my $exitcode = waitCatAndDelete "/tmp/reader.exit"; # make sure the xterm window is open and has focus
die "tests for $desc failed" if $exitcode ne 0; $machine->waitForWindow(qr/testterm/);
$machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync");
}
# wait for reader to be ready
$machine->waitForFile("${readyFile}");
$machine->sleep(1);
# send all keys
foreach ((${send})) { $machine->sendKeys($_); };
# wait for result and check
$machine->waitForFile("${resultFile}");
$machine->succeed("grep -q 'PASS:' ${resultFile}");
}; };
} };
$machine->waitForX; $machine->waitForX;
mkTest "VT keymap", "openvt -sw --"; mkTest "VT keymap", "openvt -sw --";
mkTest "Xorg keymap", "DISPLAY=:0 xterm -fullscreen -e"; mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e";
''; '';
}; };