TST: Catch fork failures and mark them as xfail instead of fail.

DWesl · DWesl · commit db71b51d230b · 2023-01-04T09:40:59.000-05:00
Not a pass, but not the fault of the test.

TST,BUG: Move pytest import to just before its use.

Hopefully this fixes the doc builds.

TST: Cygwin: Mark more fork failures as xfail.

Not a pass, but not matplotlib's fault.
diff --git a/lib/matplotlib/testing/__init__.py b/lib/matplotlib/testing/__init__.py
@@ -66,16 +66,23 @@ def subprocess_run_helper(func, *args, timeout, extra_env=None):
     """
     target = func.__name__
     module = func.__module__
-    proc = subprocess.run(
-        [sys.executable,
-         "-c",
-         f"from {module} import {target}; {target}()",
-         *args],
-        env={**os.environ, "SOURCE_DATE_EPOCH": "0", **(extra_env or {})},
-        timeout=timeout, check=True,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        universal_newlines=True)
+    try:
+        proc = subprocess.run(
+            [sys.executable,
+             "-c",
+             f"from {module} import {target}; {target}()",
+             *args],
+            env={**os.environ, "SOURCE_DATE_EPOCH": "0", **(extra_env or {})},
+            timeout=timeout, check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            universal_newlines=True)
+    except BlockingIOError:
+        if sys.platform == "cygwin":
+            import pytest
+            pytest.xfail("Fork failure")
+        else:
+            raise
     return proc
 
 
diff --git a/lib/matplotlib/tests/test_preprocess_data.py b/lib/matplotlib/tests/test_preprocess_data.py
@@ -259,7 +259,12 @@ def test_data_parameter_replacement():
         "import matplotlib.pyplot as plt"
     )
     cmd = [sys.executable, "-c", program]
-    completed_proc = subprocess.run(cmd, text=True, capture_output=True)
+    try:
+        completed_proc = subprocess.run(cmd, text=True, capture_output=True)
+    except BlockingIOError:
+        if sys.platform == "cygwin":
+            pytest.xfail("Fork failure")
+        raise
     assert 'data parameter docstring error' not in completed_proc.stderr
 
 
diff --git a/lib/matplotlib/tests/test_pyplot.py b/lib/matplotlib/tests/test_pyplot.py
@@ -20,8 +20,13 @@ def test_pyplot_up_to_date(tmpdir):
     plt_file = tmpdir.join('pyplot.py')
     plt_file.write_text(orig_contents, 'utf-8')
 
-    subprocess.run([sys.executable, str(gen_script), str(plt_file)],
-                   check=True)
+    try:
+        subprocess.run([sys.executable, str(gen_script), str(plt_file)],
+                       check=True)
+    except BlockingIOError:
+        if sys.platform == "cygwin":
+            pytest.xfail("Fork failure")
+        raise
     new_contents = plt_file.read_text('utf-8')
 
     if orig_contents != new_contents:
diff --git a/lib/matplotlib/tests/test_sphinxext.py b/lib/matplotlib/tests/test_sphinxext.py
@@ -19,8 +19,14 @@ def build_sphinx_html(source_dir, doctree_dir, html_dir, extra_args=None):
     extra_args = [] if extra_args is None else extra_args
     cmd = [sys.executable, '-msphinx', '-W', '-b', 'html',
            '-d', str(doctree_dir), str(source_dir), str(html_dir), *extra_args]
-    proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
-                 env={**os.environ, "MPLBACKEND": ""})
+    try:
+        proc = Popen(cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
+                     env={**os.environ, "MPLBACKEND": ""})
+    except BlockingIOError:
+        if sys.platform == "cygwin":
+            pytest.xfail("Fork failure")
+        else:
+            raise
     out, err = proc.communicate()
 
     assert proc.returncode == 0, \
@@ -44,9 +50,16 @@ def test_tinypages(tmp_path):
     # On CI, gcov emits warnings (due to agg headers being included with the
     # same name in multiple extension modules -- but we don't care about their
     # coverage anyways); hide them using GCOV_ERROR_FILE.
-    proc = Popen(
-        cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
-        env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull})
+    try:
+        proc = Popen(
+            cmd, stdout=PIPE, stderr=PIPE, universal_newlines=True,
+            env={**os.environ, "MPLBACKEND": "", "GCOV_ERROR_FILE": os.devnull}
+        )
+    except BlockingIOError:
+        if sys.platform == "cygwin":
+            pytest.xfail("Fork failure")
+        else:
+            raise
     out, err = proc.communicate()
 
     # Build the pages with warnings turned into errors
