diff options
| author | Robert Hensing <roberth@users.noreply.github.com> | 2022-12-24 14:53:27 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-12-24 14:53:27 +0100 |
| commit | d35f793cf2fda2dce68ddc69fa02cc9f9b9baabb (patch) | |
| tree | 7b2064f2d946a5a23b87a9f268d8334325905706 /nixos | |
| parent | 347a04955ce785be3fc422ac08103eecba892a0e (diff) | |
| parent | 562431130592150c9910b1abd5019c16c6d6fcb0 (diff) | |
Merge pull request #207563 from hercules-ci/flaky-nixosTests.keymap
Fix flaky `nixosTests.keymap`
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/tests/keymap.nix | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix index 4306a9ae2cf94..0bde21093b0a2 100644 --- a/nixos/tests/keymap.nix +++ b/nixos/tests/keymap.nix @@ -64,7 +64,6 @@ let # wait for reader to be ready machine.wait_for_file("${readyFile}") - machine.sleep(1) # send all keys for key in inputs: @@ -78,9 +77,18 @@ let with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file: tests = json.load(json_file) + # These environments used to run in the opposite order, causing the + # following error at openvt startup. + # + # openvt: Couldn't deallocate console 1 + # + # This error did not appear in successful runs. + # I don't know the exact cause, but I it seems that openvt and X are + # fighting over the virtual terminal. This does not appear to be a problem + # when the X test runs first. keymap_environments = { - "VT Keymap": "openvt -sw --", "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e", + "VT Keymap": "openvt -sw --", } machine.wait_for_x() |