about summary refs log tree commit diff
path: root/nixos/tests/aaaaxy.nix
diff options
context:
space:
mode:
authorLuflosi <luflosi@luflosi.de>2023-04-28 17:39:48 +0200
committerLuflosi <luflosi@luflosi.de>2023-05-10 14:45:01 +0200
commit220a0f4ca3347808c66436c68c25a8f516fe6551 (patch)
tree9b77d52cd4f1e79b32affa9990b2bfd5f2a1bae5 /nixos/tests/aaaaxy.nix
parent0553010b4ef21940739e76f7f1484a549a1aa15c (diff)
nixos/tests/aaaaxy: fix test
It got broken by 5c0aa8190905e4945c407d258d0a3fb369a65def.
The fix is to use a real X server instead of xvfb-run.
Diffstat (limited to 'nixos/tests/aaaaxy.nix')
-rw-r--r--nixos/tests/aaaaxy.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/nixos/tests/aaaaxy.nix b/nixos/tests/aaaaxy.nix
index a1e1d44773c82..90b3c85e0c5f2 100644
--- a/nixos/tests/aaaaxy.nix
+++ b/nixos/tests/aaaaxy.nix
@@ -3,14 +3,16 @@
   meta.maintainers = with lib.maintainers; [ Luflosi ];
 
   nodes.machine = {
-    hardware.opengl.enable = true;
+    imports = [
+      ./common/x11.nix
+    ];
   };
 
   # This starts the game from a known state, feeds it a prerecorded set of button presses
   # and then checks if the final game state is identical to the expected state.
   # This is also what AAAAXY's CI system does and serves as a good sanity check.
   testScript = ''
-    machine.wait_for_unit("basic.target")
+    machine.wait_for_x()
 
     machine.succeed(
       # benchmark.dem needs to be in a mutable directory,
@@ -18,7 +20,6 @@
       "mkdir -p '/tmp/aaaaxy/assets/demos/'",
       "ln -s '${pkgs.aaaaxy.testing_infra}/assets/demos/benchmark.dem' '/tmp/aaaaxy/assets/demos/'",
       """
-        '${pkgs.xvfb-run}/bin/xvfb-run' \
         '${pkgs.aaaaxy.testing_infra}/scripts/regression-test-demo.sh' \
         'aaaaxy' 'on track for Any%, All Paths and No Teleports' \
         '${pkgs.aaaaxy}/bin/aaaaxy' '/tmp/aaaaxy/assets/demos/benchmark.dem'