Skip to content

Commit 89195ec

Browse files
authored
Merge pull request #23075 from meeseeksmachine/auto-backport-of-pr-23069-on-v3.5.x
Backport PR #23069 on branch v3.5.x (TST: forgive more failures on pyside2 / pyside6 cross imports)
2 parents 1eb49ae + 6ad808d commit 89195ec

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

lib/matplotlib/tests/test_backends_interactive.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,11 @@ def test_cross_Qt_imports():
350350
except subprocess.CalledProcessError as ex:
351351
# if segfault, carry on. We do try to warn the user they
352352
# are doing something that we do not expect to work
353-
if ex.returncode == -11:
353+
if ex.returncode == -signal.SIGSEGV:
354+
continue
355+
# We got the abort signal which is likely because the Qt5 /
356+
# Qt6 cross import is unhappy, carry on.
357+
elif ex.returncode == -signal.SIGABRT:
354358
continue
355359
raise
356360

0 commit comments

Comments
 (0)