NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commit40f20c3

committed

FIX: Move all tests using subprocess to the same worker on windows

This is a somewhat wild guess based on#29797 (comment)> which makes me think we are somehow crossing state what launching the subprocesses.Using the `xdist_group` with `--dist=loadgroup` should put all tests ofthat group to the same worker according tohttps://pytest-xdist.readthedocs.io/en/stable/distribution.html.I've only added `--dist=loadgroup` to the windows pipelines, so tests on other systems are not affected at all.The first test is to see whether this works in the PR. - But to be sure,it think we would need to put this on master and monitor whether thetimeouts disappear.

1 parent919d9e9 commit40f20c3Copy full SHA for 40f20c3

File tree

17 files changed

+34

-0

lines changed

17 files changed

+34

-0

lines changed

`‎azure-pipelines.yml`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ stages:`
`149`	`149`
`150`	`150`	`PYTHONFAULTHANDLER=1 pytest -rfEsXR -n 2 \`
`151`	`151`	`--maxfail=50 --timeout=300 --durations=25 \`
	`152`	`+ --dist=loadgroup \`
`152`	`153`	`--junitxml=junit/test-results.xml --cov-report=xml --cov=lib`
`153`	`154`
`154`	`155`	`if [[ $VS_VER == 2022 ]]; then`

`‎lib/matplotlib/tests/test_backend_inline.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`pytest.importorskip('matplotlib_inline')`
`13`	`13`
`14`	`14`
	`15`	`+@pytest.mark.xdist_group(name="subprocess")`
`15`	`16`	`deftest_ipynb():`
`16`	`17`	`nb_path=Path(__file__).parent/'test_inline_01.ipynb'`
`17`	`18`

`‎lib/matplotlib/tests/test_backend_macosx.py`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,7 @@ def _test_cached_renderer():`
`25`	`25`
`26`	`26`
`27`	`27`	`@pytest.mark.backend('macosx',skip_on_importerror=True)`
	`28`	`+@pytest.mark.xdist_group(name="subprocess")`
`28`	`29`	`deftest_cached_renderer():`
`29`	`30`	`subprocess_run_helper(_test_cached_renderer,timeout=_test_timeout,`
`30`	`31`	`extra_env={"MPLBACKEND":"macosx"})`
`@@ -55,13 +56,15 @@ def new_choose_save_file(title, directory, filename):`
`55`	`56`
`56`	`57`
`57`	`58`	`@pytest.mark.backend('macosx',skip_on_importerror=True)`
	`59`	`+@pytest.mark.xdist_group(name="subprocess")`
`58`	`60`	`deftest_savefig_rcparam(tmp_path):`
`59`	`61`	`subprocess_run_helper(`
`60`	`62`	`_test_savefig_rcparam,timeout=_test_timeout,`
`61`	`63`	`extra_env={"MPLBACKEND":"macosx","TEST_SAVEFIG_PATH":tmp_path})`
`62`	`64`
`63`	`65`
`64`	`66`	`@pytest.mark.backend('macosx',skip_on_importerror=True)`
	`67`	`+@pytest.mark.xdist_group(name="subprocess")`
`65`	`68`	`deftest_ipython():`
`66`	`69`	`frommatplotlib.testingimportipython_in_subprocess`
`67`	`70`	`ipython_in_subprocess("osx", {(8,24):"macosx", (7,0):"MacOSX"})`
`@@ -81,6 +84,7 @@ def _test_save_figure_return():`
`81`	`84`
`82`	`85`
`83`	`86`	`@pytest.mark.backend('macosx',skip_on_importerror=True)`
	`87`	`+@pytest.mark.xdist_group(name="subprocess")`
`84`	`88`	`deftest_save_figure_return():`
`85`	`89`	`subprocess_run_helper(_test_save_figure_return,timeout=_test_timeout,`
`86`	`90`	`extra_env={"MPLBACKEND":"macosx"})`

`‎lib/matplotlib/tests/test_backend_nbagg.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`# From https://blog.thedataincubator.com/2016/06/testing-jupyter-notebooks/`
`14`	`14`
`15`	`15`
	`16`	`+@pytest.mark.xdist_group(name="subprocess")`
`16`	`17`	`deftest_ipynb():`
`17`	`18`	`nb_path=Path(__file__).parent/'test_nbagg_01.ipynb'`
`18`	`19`

`‎lib/matplotlib/tests/test_backend_tk.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ def _isolated_tk_test(success_count, func=None):`
`43`	`43`	`sys.platform=='darwin'andsys.version_info[:2]< (3,11),`
`44`	`44`	`reason='Tk version mismatch on Azure macOS CI'`
`45`	`45`	`)`
	`46`	`+@pytest.mark.xdist_group(name="subprocess")`
`46`	`47`	`@functools.wraps(func)`
`47`	`48`	`deftest_func():`
`48`	`49`	`# even if the package exists, may not actually be importable this can`

`‎lib/matplotlib/tests/test_backend_webagg.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`
`8`	`8`
`9`	`9`	`@pytest.mark.parametrize("backend", ["webagg","nbagg"])`
	`10`	`+@pytest.mark.xdist_group(name="subprocess")`
`10`	`11`	`deftest_webagg_fallback(backend):`
`11`	`12`	`pytest.importorskip("tornado")`
`12`	`13`	`ifbackend=="nbagg":`

`‎lib/matplotlib/tests/test_basic.py`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`importsys`
`4`	`4`	`importtextwrap`
`5`	`5`
	`6`	`+importpytest`
	`7`	`+`
`6`	`8`	`frommatplotlib.testingimportsubprocess_run_for_testing`
`7`	`9`
`8`	`10`
`@@ -28,6 +30,7 @@ def test_override_builtins():`
`28`	`30`	`assertoverridden<=ok_to_override`
`29`	`31`
`30`	`32`
	`33`	`+@pytest.mark.xdist_group(name="subprocess")`
`31`	`34`	`deftest_lazy_imports():`
`32`	`35`	`source=textwrap.dedent("""`
`33`	`36`	`import sys`

`‎lib/matplotlib/tests/test_determinism.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -154,6 +154,7 @@ def draw(self, renderer=None):`
`154`	`154`	`pytest.param("mhip","svg",True,marks=needs_usetex),`
`155`	`155`	`]`
`156`	`156`	`)`
	`157`	`+@pytest.mark.xdist_group(name="subprocess")`
`157`	`158`	`deftest_determinism_check(objects,fmt,usetex):`
`158`	`159`	`"""`
`159`	`160`	`Output three times the same graphs and checks that the outputs are exactly`
`@@ -195,6 +196,7 @@ def test_determinism_check(objects, fmt, usetex):`
`195`	`196`	`("ps",b"%%CreationDate: Sat Jan 01 00:00:00 2000"),`
`196`	`197`	`]`
`197`	`198`	`)`
	`199`	`+@pytest.mark.xdist_group(name="subprocess")`
`198`	`200`	`deftest_determinism_source_date_epoch(fmt,string):`
`199`	`201`	`"""`
`200`	`202`	`Test SOURCE_DATE_EPOCH support. Output a document with the environment`

`‎lib/matplotlib/tests/test_font_manager.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -282,12 +282,14 @@ def bad_idea(n):`
`282`	`282`	`raiseRuntimeError("thread failed to join")`
`283`	`283`
`284`	`284`
	`285`	`+@pytest.mark.xdist_group(name="subprocess")`
`285`	`286`	`deftest_fontcache_thread_safe():`
`286`	`287`	`pytest.importorskip('threading')`
`287`	`288`
`288`	`289`	`subprocess_run_helper(_test_threading,timeout=10)`
`289`	`290`
`290`	`291`
	`292`	`+@pytest.mark.xdist_group(name="subprocess")`
`291`	`293`	`deftest_lockfilefailure(tmp_path):`
`292`	`294`	`# The logic here:`
`293`	`295`	`# 1. get a temp directory from pytest`

`‎lib/matplotlib/tests/test_matplotlib.py`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ def test_parse_to_version_info(version_str, version_tuple):`
`22`	`22`	`reason="chmod() doesn't work as is on Windows")`
`23`	`23`	`@pytest.mark.skipif(sys.platform!="win32"andos.geteuid()==0,`
`24`	`24`	`reason="chmod() doesn't work as root")`
	`25`	`+@pytest.mark.xdist_group(name="subprocess")`
`25`	`26`	`deftest_tmpconfigdir_warning(tmp_path):`
`26`	`27`	`"""Test that a warning is emitted if a temporary configdir must be used."""`
`27`	`28`	`mode=os.stat(tmp_path).st_mode`
`@@ -36,6 +37,7 @@ def test_tmpconfigdir_warning(tmp_path):`
`36`	`37`	`os.chmod(tmp_path,mode)`
`37`	`38`
`38`	`39`
	`40`	`+@pytest.mark.xdist_group(name="subprocess")`
`39`	`41`	`deftest_importable_with_no_home(tmp_path):`
`40`	`42`	`subprocess_run_for_testing(`
`41`	`43`	`[sys.executable,"-c",`
`@@ -65,6 +67,7 @@ def parse(key):`
`65`	`67`	`set(backend_registry.list_builtin(BackendFilter.NON_INTERACTIVE)))`
`66`	`68`
`67`	`69`
	`70`	`+@pytest.mark.xdist_group(name="subprocess")`
`68`	`71`	`deftest_importable_with__OO():`
`69`	`72`	`"""`
`70`	`73`	`When using -OO or export PYTHONOPTIMIZE=2, docstrings are discarded,`

`‎lib/matplotlib/tests/test_pickle.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -136,6 +136,7 @@ def _pickle_load_subprocess():`
`136`	`136`
`137`	`137`
`138`	`138`	`@mpl.style.context("default")`
	`139`	`+@pytest.mark.xdist_group(name="subprocess")`
`139`	`140`	`@check_figures_equal()`
`140`	`141`	`deftest_pickle_load_from_subprocess(fig_test,fig_ref,tmp_path):`
`141`	`142`	`_generate_complete_test_figure(fig_ref)`
`@@ -331,6 +332,7 @@ def _test_axeswidget_interactive():`
`331`	`332`	`sys.platform=='darwin'andsys.version_info[:2]< (3,11),`
`332`	`333`	`reason='Tk version mismatch on Azure macOS CI'`
`333`	`334`	`)`
	`335`	`+@pytest.mark.xdist_group(name="subprocess")`
`334`	`336`	`deftest_axeswidget_interactive():`
`335`	`337`	`subprocess_run_helper(`
`336`	`338`	`_test_axeswidget_interactive,`

`‎lib/matplotlib/tests/test_preprocess_data.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -245,6 +245,7 @@ def funcy(ax, x, y, z, t=None):`
`245`	`245`	`funcy.__doc__)`
`246`	`246`
`247`	`247`
	`248`	`+@pytest.mark.xdist_group(name="subprocess")`
`248`	`249`	`deftest_data_parameter_replacement():`
`249`	`250`	`"""`
`250`	`251`	`Test that the docstring contains the correct data parameter stub`

`‎lib/matplotlib/tests/test_pyplot.py`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`frommatplotlibimportpyplotasplt`
`12`	`12`
`13`	`13`
	`14`	`+@pytest.mark.xdist_group(name="subprocess")`
`14`	`15`	`deftest_pyplot_up_to_date(tmp_path):`
`15`	`16`	`pytest.importorskip("black")`
`16`	`17`
`@@ -348,6 +349,7 @@ def test_set_current_axes_on_subfigure():`
`348`	`349`	`assertplt.gca()==ax`
`349`	`350`
`350`	`351`
	`352`	`+@pytest.mark.xdist_group(name="subprocess")`
`351`	`353`	`deftest_pylab_integration():`
`352`	`354`	`IPython=pytest.importorskip("IPython")`
`353`	`355`	`mpl.testing.subprocess_run_helper(`

`‎lib/matplotlib/tests/test_rcparams.py`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -529,6 +529,7 @@ def test_rcparams_reset_after_fail():`
`529`	`529`
`530`	`530`
`531`	`531`	`@pytest.mark.skipif(sys.platform!="linux",reason="Linux only")`
	`532`	`+@pytest.mark.xdist_group(name="subprocess")`
`532`	`533`	`deftest_backend_fallback_headless_invalid_backend(tmp_path):`
`533`	`534`	`env= {**os.environ,`
`534`	`535`	`"DISPLAY":"","WAYLAND_DISPLAY":"",`
`@@ -546,6 +547,7 @@ def test_backend_fallback_headless_invalid_backend(tmp_path):`
`546`	`547`
`547`	`548`
`548`	`549`	`@pytest.mark.skipif(sys.platform!="linux",reason="Linux only")`
	`550`	`+@pytest.mark.xdist_group(name="subprocess")`
`549`	`551`	`deftest_backend_fallback_headless_auto_backend(tmp_path):`
`550`	`552`	`# specify a headless mpl environment, but request a graphical (tk) backend`
`551`	`553`	`env= {**os.environ,`
`@@ -570,6 +572,7 @@ def test_backend_fallback_headless_auto_backend(tmp_path):`
`570`	`572`	`@pytest.mark.skipif(`
`571`	`573`	`sys.platform=="linux"andnot_c_internal_utils.xdisplay_is_valid(),`
`572`	`574`	`reason="headless")`
	`575`	`+@pytest.mark.xdist_group(name="subprocess")`
`573`	`576`	`deftest_backend_fallback_headful(tmp_path):`
`574`	`577`	`ifparse_version(pytest.__version__)>=parse_version('8.2.0'):`
`575`	`578`	`pytest_kwargs=dict(exc_type=ImportError)`

`‎lib/matplotlib/tests/test_sphinxext.py`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,7 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None):`
`32`	`32`	`asserthtml_dir.is_dir()`
`33`	`33`
`34`	`34`
	`35`	`+@pytest.mark.xdist_group(name="subprocess")`
`35`	`36`	`deftest_tinypages(tmp_path):`
`36`	`37`	`shutil.copytree(Path(__file__).parent/'tinypages',tmp_path,`
`37`	`38`	`dirs_exist_ok=True)`
`@@ -124,6 +125,7 @@ def plot_directive_file(num):`
`124`	`125`	`assertfilecmp.cmp(range_6,plot_file(5))`
`125`	`126`
`126`	`127`
	`128`	`+@pytest.mark.xdist_group(name="subprocess")`
`127`	`129`	`deftest_plot_html_show_source_link(tmp_path):`
`128`	`130`	`parent=Path(__file__).parent`
`129`	`131`	`shutil.copyfile(parent/'tinypages/conf.py',tmp_path/'conf.py')`
`@@ -147,6 +149,7 @@ def test_plot_html_show_source_link(tmp_path):`
`147`	`149`
`148`	`150`
`149`	`151`	`@pytest.mark.parametrize('plot_html_show_source_link', [0,1])`
	`152`	`+@pytest.mark.xdist_group(name="subprocess")`
`150`	`153`	`deftest_show_source_link_true(tmp_path,plot_html_show_source_link):`
`151`	`154`	`# Test that a source link is generated if :show-source-link: is true,`
`152`	`155`	`# whether or not plot_html_show_source_link is true.`
`@@ -167,6 +170,7 @@ def test_show_source_link_true(tmp_path, plot_html_show_source_link):`
`167`	`170`
`168`	`171`
`169`	`172`	`@pytest.mark.parametrize('plot_html_show_source_link', [0,1])`
	`173`	`+@pytest.mark.xdist_group(name="subprocess")`
`170`	`174`	`deftest_show_source_link_false(tmp_path,plot_html_show_source_link):`
`171`	`175`	`# Test that a source link is NOT generated if :show-source-link: is false,`
`172`	`176`	`# whether or not plot_html_show_source_link is true.`
`@@ -186,6 +190,7 @@ def test_show_source_link_false(tmp_path, plot_html_show_source_link):`
`186`	`190`	`assertlen(list(html_dir.glob("**/index-1.py")))==0`
`187`	`191`
`188`	`192`
	`193`	`+@pytest.mark.xdist_group(name="subprocess")`
`189`	`194`	`deftest_srcset_version(tmp_path):`
`190`	`195`	`shutil.copytree(Path(__file__).parent/'tinypages',tmp_path,`
`191`	`196`	`dirs_exist_ok=True)`

`‎lib/matplotlib/tests/test_texmanager.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ def test_unicode_characters():`
`64`	`64`
`65`	`65`
`66`	`66`	`@needs_usetex`
	`67`	`+@pytest.mark.xdist_group(name="subprocess")`
`67`	`68`	`deftest_openin_any_paranoid():`
`68`	`69`	`completed=subprocess_run_for_testing(`
`69`	`70`	`[sys.executable,"-c",`

`‎lib/matplotlib/tests/test_ticker.py`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1766,6 +1766,7 @@ def _impl_locale_comma():`
`1766`	`1766`	`assertx=='0,5'`
`1767`	`1767`
`1768`	`1768`
	`1769`	`+@pytest.mark.xdist_group(name="subprocess")`
`1769`	`1770`	`deftest_locale_comma():`
`1770`	`1771`	# On some systems/pytest versions, `pytest.skip` in an exception handler
`1771`	`1772`	`# does not skip, but is treated as an exception, so directly running this`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit40f20c3

File tree

17 files changed

17 files changed

`‎azure-pipelines.yml`

`‎lib/matplotlib/tests/test_backend_inline.py`

`‎lib/matplotlib/tests/test_backend_macosx.py`

`‎lib/matplotlib/tests/test_backend_nbagg.py`

`‎lib/matplotlib/tests/test_backend_tk.py`

`‎lib/matplotlib/tests/test_backend_webagg.py`

`‎lib/matplotlib/tests/test_basic.py`

`‎lib/matplotlib/tests/test_determinism.py`

`‎lib/matplotlib/tests/test_font_manager.py`

`‎lib/matplotlib/tests/test_matplotlib.py`

`‎lib/matplotlib/tests/test_pickle.py`

`‎lib/matplotlib/tests/test_preprocess_data.py`

`‎lib/matplotlib/tests/test_pyplot.py`

`‎lib/matplotlib/tests/test_rcparams.py`

`‎lib/matplotlib/tests/test_sphinxext.py`

`‎lib/matplotlib/tests/test_texmanager.py`

`‎lib/matplotlib/tests/test_ticker.py`

0 commit comments