JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixos/tests/keymap: wait for xdotool to succeed

Browse Source 
xdotool failed in rare cases when a window was already created
but not yet decorated by the window manager.
also prevent a (never observed but possible) race condition
This commit is contained in:
xeji 2018-04-25 00:06:11 +02:00
parent d3d41b51f1
commit 6891bda370
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nixos/tests/keymap.nix
View File

@ -8,17 +8,19 @@ let
testReader = pkgs.writeScript "test-input-reader" '' testReader = pkgs.writeScript "test-input-reader" ''
#!${pkgs.stdenv.shell} #!${pkgs.stdenv.shell}
rm -f ${resultFile} rm -f ${resultFile} ${resultFile}.tmp
logger "testReader: START: Waiting for $1 characters, expecting '$2'." logger "testReader: START: Waiting for $1 characters, expecting '$2'."
touch ${readyFile} touch ${readyFile}
read -r -N $1 chars read -r -N $1 chars
rm -f ${readyFile} rm -f ${readyFile}
if [ "$chars" == "$2" ]; then if [ "$chars" == "$2" ]; then
logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile} logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp
else else
logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile} logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp
fi fi
# rename after the file is written to prevent a race condition
mv ${resultFile}.tmp ${resultFile}
''; '';
@ -52,7 +54,7 @@ let
if ($desc eq "Xorg keymap") { if ($desc eq "Xorg keymap") {
# make sure the xterm window is open and has focus # make sure the xterm window is open and has focus
$machine->waitForWindow(qr/testterm/); $machine->waitForWindow(qr/testterm/);
$machine->succeed("${pkgs.xdotool}/bin/xdotool search --name testterm windowactivate --sync"); $machine->waitUntilSucceeds("${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible --class testterm windowfocus --sync");
} }
# wait for reader to be ready # wait for reader to be ready
@ -71,7 +73,7 @@ let
$machine->waitForX; $machine->waitForX;
mkTest "VT keymap", "openvt -sw --"; mkTest "VT keymap", "openvt -sw --";
mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -fullscreen -e"; mkTest "Xorg keymap", "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e";
''; '';
}; };