Commit bcd72f8

authored

Merge pull request #23194 from tacaswell/auto-backport-of-pr-23095-on-v3.5.x

Backport PR #23095: Try to unbreak CI by xfailing OSX Tk tests

2 parents c5a24ff + 4da387e commit bcd72f8Copy full SHA for bcd72f8

File tree

+10

-0

lines changed

+10

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ def _isolated_tk_test(success_count, func=None):`
`31`	`31`	`# Remove decorators.`
`32`	`32`	`source = re.search(r"(?ms)^def .*", inspect.getsource(func)).group(0)`
`33`	`33`
	`34`	`+ @pytest.mark.xfail( # GitHub issue #23094`
	`35`	`+ sys.platform == 'darwin',`
	`36`	`+ reason="Tk version mismatch on OSX CI"`
	`37`	`+ )`
`34`	`38`	`@functools.wraps(func)`
`35`	`39`	`def test_func():`
`36`	`40`	`try:`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -59,6 +59,9 @@ def _get_testable_interactive_backends():`
`59`	`59`	`elif env["MPLBACKEND"].startswith('wx') and sys.platform == 'darwin':`
`60`	`60`	`# ignore on OSX because that's currently broken (github #16849)`
`61`	`61`	`marks.append(pytest.mark.xfail(reason='github #16849'))`
	`62`	`+ elif env["MPLBACKEND"] == "tkagg" and sys.platform == 'darwin':`
	`63`	`+ marks.append( # GitHub issue #23094`
	`64`	`+ pytest.mark.xfail(reason="Tk version mismatch on OSX CI"))`
`62`	`65`	`envs.append(pytest.param(env, marks=marks, id=str(env)))`
`63`	`66`	`return envs`
`64`	`67`
`@@ -231,6 +234,9 @@ def _test_thread_impl():`
`231`	`234`	`reason='PyPy does not support Tkinter threading: '`
`232`	`235`	`'https://foss.heptapod.net/pypy/pypy/-/issues/1929',`
`233`	`236`	`strict=True))`
	`237`	`+ elif backend == "tkagg" and sys.platform == "darwin":`
	`238`	`+ param.marks.append( # GitHub issue #23094`
	`239`	`+ pytest.mark.xfail("Tk version mismatch on OSX CI"))`
`234`	`240`
`235`	`241`
`236`	`242`	`@pytest.mark.parametrize("env", _thread_safe_backends)`

Comments

(0)