Skip to content

Skip more tests on pure-Wayland systems #29206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 4, 2024
Merged

Skip more tests on pure-Wayland systems #29206

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c256f7
TST: Skip wx tests when on pure Wayland
QuLogic Nov 30, 2024
e83e847
TST: Skip cross-Qt checks if no X/Wayland display is available
QuLogic Nov 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/matplotlib/tests/test_backends_interactive.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,10 @@ def _get_available_interactive_backends():
missing = [dep for dep in deps if not importlib.util.find_spec(dep)]
if missing:
reason = "{} cannot be imported".format(", ".join(missing))
elif env["MPLBACKEND"] == "tkagg" and _is_linux_and_xdisplay_invalid:
elif _is_linux_and_xdisplay_invalid and (
env["MPLBACKEND"] == "tkagg"
# Remove when https://github.com/wxWidgets/Phoenix/pull/2638 is out.
or env["MPLBACKEND"].startswith("wx")):
reason = "$DISPLAY is unset"
elif _is_linux_and_display_invalid:
reason = "$DISPLAY and $WAYLAND_DISPLAY are unset"
Expand Down Expand Up @@ -452,6 +455,9 @@ def qt5_and_qt6_pairs():
yield from ([qt5, qt6], [qt6, qt5])


@pytest.mark.skipif(
sys.platform == "linux" and not _c_internal_utils.display_is_valid(),
reason="$DISPLAY and $WAYLAND_DISPLAY are unset")
@pytest.mark.parametrize('host, mpl', [*qt5_and_qt6_pairs()])
def test_cross_Qt_imports(host, mpl):
try:
Expand Down
Loading