about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorRobert Hensing <robert@roberthensing.nl>2022-12-24 13:58:22 +0100
committerRobert Hensing <robert@roberthensing.nl>2022-12-24 14:06:31 +0100
commit2b5677caa342629ee42743ac92556ac8bf5e8ef9 (patch)
tree7acb34b8c60562c79a94838917186d56be4a8b99 /nixos
parent3930bcb3c3998dacc7158b30b778213c5cee06a2 (diff)
nixosTests.keymap: Reorder test cases to make setup more reliable
I've run this test on repeat for hours, so there's reason to be
hopeful.
Diffstat (limited to 'nixos')
-rw-r--r--nixos/tests/keymap.nix11
1 files changed, 10 insertions, 1 deletions
diff --git a/nixos/tests/keymap.nix b/nixos/tests/keymap.nix
index 4306a9ae2cf94..40f4762bed835 100644
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@@ -78,9 +78,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()