From 5ea8115afe1bdff7a87925ab228da1aef498f430 Mon Sep 17 00:00:00 2001
From: Sharlatan Hellseher <sharlatanus@gmail.com>
Date: Sun, 28 Sep 2025 22:44:16 +0100
Subject: [PATCH] gnu: quicktile: Simplify tests.

* gnu/packages/wm.scm (quicktile)[arguments] <test-flags>: Provide
option for "tests" directory.
<phases>: Use default 'check; add 'pre-check.
[native-inputs]: Remove xvfb-run; add xorg-server-for-tests.

Change-Id: Ia6d5dea156fd8fb8949bbe26720a027a5591cf9d
---
 gnu/packages/wm.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 05cd3a1410c1feecc0215be1434a630cdd4f1354..e4853c589b691c7bae23c5fadded9a500b609fa4 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1091,33 +1091,28 @@ prompt.")
       (build-system pyproject-build-system)
       (arguments
        (list
+        #:test-flags
+        #~(list "tests")
         #:phases
         #~(modify-phases %standard-phases
-            (replace 'check
+            (add-before 'check 'pre-check
+              ;; tests/test_functional.py moves windows around and thus needs
+              ;; access to an X server.
               (lambda* (#:key tests? #:allow-other-keys)
                 (when tests?
                   (setenv "HOME" "/tmp")
                   (mkdir-p "/tmp/.config")
+                  (system "Xvfb :1 &")
+                  (setenv "DISPLAY" ":1")
                   ;; First run creates /tmp/.config/quicktile.cfg.
-                  (invoke "xvfb-run"
-                          "-a"
-                          "./quicktile.sh")
-                  ;; test_functional.py moves windows around and thus needs
-                  ;; access to an X server.
-                  (invoke "xvfb-run"
-                          "-a"
-                          "python3"
-                          "-m"
-                          "pytest"
-                          "-vv"
-                          "tests")))))))
+                  (invoke "./quicktile.sh")))))))
       (native-inputs
        (list openbox ;necessary for test_functional.py
              python-pluggy
              python-pytest
              python-pytest-cov
              python-setuptools
-             xvfb-run))
+             xorg-server-for-tests))
       (inputs
        (list gtk+
              libwnck