From 862e9ee91c715b7d887636a8eb18ec0906d5c628 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 23 May 2025 02:30:08 +0000 Subject: [PATCH] nixosTests.turbovnc-headless-server: Remove expected-failing test. It doesn't fail as expected anymore because `LIBGL_DRIVERS_PATH` was removed in Mesa 24.2, and apparently there's no replacement for it: https://github.com/NixOS/nixpkgs/issues/328923 Given that it was removed, and https://www.phoronix.com/news/Mesa-24.2-Modern-Interfaces and https://www.supergoodcode.com/long-road-to-DRIL/ saying that removes the problem it originally caused (also for us), this test is probably superfluous because the thing it guards against is gone. (cherry picked from commit e1a5818d487c7d021fe9f53f323970d4a8f29f03) --- nixos/tests/turbovnc-headless-server.nix | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/nixos/tests/turbovnc-headless-server.nix b/nixos/tests/turbovnc-headless-server.nix index f51968e29b29..6b3ade7179ff 100644 --- a/nixos/tests/turbovnc-headless-server.nix +++ b/nixos/tests/turbovnc-headless-server.nix @@ -120,24 +120,6 @@ import ./make-test-python.nix ( ) - # Checks that we detect glxgears failing when - # `LIBGL_DRIVERS_PATH=/nonexistent` is set - # (in which case software rendering should not work). - def test_glxgears_failing_with_bad_driver_path(): - machine.execute( - # Note trailing & for backgrounding. - "(env DISPLAY=:0 LIBGL_DRIVERS_PATH=/nonexistent glxgears -info | tee /tmp/glxgears-should-fail.stdout) 3>&1 1>&2 2>&3 | tee /tmp/glxgears-should-fail.stderr >&2 &" - ) - machine.wait_until_succeeds("test -f /tmp/glxgears-should-fail.stderr") - wait_until_terminated_or_succeeds( - termination_check_shell_command="pidof glxgears", - success_check_shell_command="grep 'MESA-LOADER: failed to open swrast' /tmp/glxgears-should-fail.stderr", - get_detail_message_fn=lambda: "Contents of /tmp/glxgears-should-fail.stderr:\n" - + machine.succeed("cat /tmp/glxgears-should-fail.stderr"), - ) - machine.wait_until_fails("pidof glxgears") - - # Starts glxgears, backgrounding it. Waits until it prints the `GL_RENDERER`. # Does not quit glxgears. def test_glxgears_prints_renderer(): @@ -158,9 +140,6 @@ import ./make-test-python.nix ( start_xvnc() wait_until_xvnc_glx_ready() - with subtest("Ensure bad driver path makes glxgears fail"): - test_glxgears_failing_with_bad_driver_path() - with subtest("Run 3D application (glxgears)"): test_glxgears_prints_renderer() @@ -170,8 +149,6 @@ import ./make-test-python.nix ( # Copy files down. machine.copy_from_vm("/tmp/glxgears.png") machine.copy_from_vm("/tmp/glxgears.stdout") - machine.copy_from_vm("/tmp/glxgears-should-fail.stdout") - machine.copy_from_vm("/tmp/glxgears-should-fail.stderr") machine.copy_from_vm("/tmp/Xvnc.stdout") machine.copy_from_vm("/tmp/Xvnc.stderr") '';