[gentoo-commits] repo/gentoo:master commit in: x11-wm/xpra/

[James Le Cuirot]

commit:     13c19aab15dbfb2a21b3489af4d8b5f87c6d1a89
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep  4 10:57:13 2022 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Sep  4 10:57:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13c19aab

x11-wm/xpra: Prevent Wayland from confusing the tests

Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 x11-wm/xpra/xpra-4.3.3.ebuild | 3 ++-
 x11-wm/xpra/xpra-4.3.4.ebuild | 3 ++-
 x11-wm/xpra/xpra-9999.ebuild  | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/x11-wm/xpra/xpra-4.3.3.ebuild b/x11-wm/xpra/xpra-4.3.3.ebuild
index a50b752c6ed4..ade4ca7fc866 100644
--- a/x11-wm/xpra/xpra-4.3.3.ebuild
+++ b/x11-wm/xpra/xpra-4.3.3.ebuild
@@ -185,7 +185,8 @@ python_test() {
        distutils_install_for_testing
        xdg_environment_reset
 
-       PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+       env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+       PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
        XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
                "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }

diff --git a/x11-wm/xpra/xpra-4.3.4.ebuild b/x11-wm/xpra/xpra-4.3.4.ebuild
index a0bcf0ffcbc9..b5532cbb6507 100644
--- a/x11-wm/xpra/xpra-4.3.4.ebuild
+++ b/x11-wm/xpra/xpra-4.3.4.ebuild
@@ -183,7 +183,8 @@ python_test() {
        distutils_install_for_testing
        xdg_environment_reset
 
-       PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+       env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+       PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
        XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
                "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }

diff --git a/x11-wm/xpra/xpra-9999.ebuild b/x11-wm/xpra/xpra-9999.ebuild
index 5dea4bc89ba3..8f90e620cdf4 100644
--- a/x11-wm/xpra/xpra-9999.ebuild
+++ b/x11-wm/xpra/xpra-9999.ebuild
@@ -182,7 +182,8 @@ python_test() {
        distutils_install_for_testing
        xdg_environment_reset
 
-       PYTHONPATH=${S}/tests/unittests:${BUILD_DIR}/test/lib \
+       env -u WAYLAND_DISPLAY -u XDG_SESSION_TYPE \
+       PYTHONPATH="${S}/tests/unittests:${BUILD_DIR}/test/lib" \
        XPRA_SYSTEMD_RUN=$(usex systemd) XPRA_TEST_COVERAGE=0 \
                "${PYTHON}" "${S}"/tests/unittests/unit/run.py || die
 }