Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[18.03] nixos/tests/keymap: improve keymap tests #39670

Merged
merged 2 commits into from Apr 29, 2018
Merged

[18.03] nixos/tests/keymap: improve keymap tests #39670

merged 2 commits into from Apr 29, 2018

Conversation

xeji
Copy link
Contributor

@xeji xeji commented Apr 29, 2018

Motivation for this change

Close #39330. Backport #39400 and #39473 to make keymap tests fail less frequently on Hydra.
We may still see some non-deterministic failures with this, but it looks better than before. Fingers crossed.

The tests might be further improved by simulating the keystrokes on the test VM itself rather than via the qemu monitor. But let's wait and see if this is really necessary.

cc @srhb @vcunat

Things done
  • [x ] Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@xeji
nixos/tests/keymap: improve keymap tests
f0e2572 
simplify tests, prevent timeouts and non-deterministic failures

(cherry picked from commit 84a6e18)
@xeji
nixos/tests/keymap: wait for xdotool to succeed
d0de57d 
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

(cherry picked from commit 6891bda)
@Mic92
Copy link
Member

Mic92 commented Apr 29, 2018

@GrahamcOfBorg test keymap.azerty

@NixOS NixOS deleted a comment from GrahamcOfBorg Apr 29, 2018
@NixOS NixOS deleted a comment from GrahamcOfBorg Apr 29, 2018
@NixOS NixOS deleted a comment from GrahamcOfBorg Apr 29, 2018
@NixOS NixOS deleted a comment from GrahamcOfBorg Apr 29, 2018
@Mic92
Copy link
Member

Mic92 commented Apr 29, 2018

@GrahamcOfBorg test keymap.neo

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.keymap.azerty

Partial log (click to expand)

syncing
machine: running command: sync
machine: exit status 0
2 out of 2 tests succeeded
test script finished in 32.72s
cleaning up
killing machine (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/95v91dvljiw193cp3s6q3jp8zi58rq8p-vm-test-run-keymap-azerty

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.keymap.azerty

Partial log (click to expand)

syncing
machine: running command: sync
machine: exit status 0
2 out of 2 tests succeeded
test script finished in 39.68s
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/hhjsn61bg55xn5d80c8r3v5933q3l90p-vm-test-run-keymap-azerty

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.keymap.neo

Partial log (click to expand)

syncing
machine: running command: sync
machine: exit status 0
2 out of 2 tests succeeded
test script finished in 38.72s
cleaning up
killing machine (pid 627)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/r7p7v00q7099rs2f4za6pi8zgzbhhi33-vm-test-run-keymap-neo

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.keymap.neo

Partial log (click to expand)

syncing
machine: running command: sync
machine: exit status 0
2 out of 2 tests succeeded
test script finished in 30.37s
cleaning up
killing machine (pid 593)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/hliz3r86hxfjn7w7si37a2n5gsf6ii7b-vm-test-run-keymap-neo

@srhb
Copy link
Contributor

srhb commented Apr 29, 2018

Tested the full set locally. Looks great!

@srhb srhb merged commit ce0d9d6 into NixOS:release-18.03 Apr 29, 2018
@xeji xeji deleted the keymap-tests-18.03 branch April 29, 2018 09:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
6.topic: nixos 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@xeji @Mic92 @GrahamcOfBorg @srhb