Fix running contour's test_internal_cpp_api directly.

QuLogic · QuLogic · commit ed0296568e39 · 2020-06-29T17:35:37.000-04:00
The `matplotlib._contour` module is lazily loaded, so using it directly (as done in this test) may fail if something else doesn't load it. This test would fail if it was the first contour-related test run in a process (if testing in parallel), or if just called as the only test, i.e., this commit fixes: ``` $ pytest -k test_internal_cpp_api lib/matplotlib/tests/test_contour.py __________ test_internal_cpp_api[args0-TypeError-function takes exactly 6 arguments (0 given)] __________ args = (), cls = <class 'TypeError'>, message = 'function takes exactly 6 arguments (0 given)' @pytest.mark.parametrize("args, cls, message", [ ((), TypeError, 'function takes exactly 6 arguments (0 given)'), ((1, 2, 3, 4, 5, 6), ValueError, 'Expected 2-dimensional array, got 0'), (([[0]], [[0]], [[]], None, True, 0), ValueError, 'x, y and z must all be 2D arrays with the same dimensions'), (([[0]], [[0]], [[0]], None, True, 0), ValueError, 'x, y and z must all be at least 2x2 arrays'), ((*[np.arange(4).reshape((2, 2))] * 3, [[0]], True, 0), ValueError, 'If mask is set it must be a 2D array with the same dimensions as x.'), ]) def test_internal_cpp_api(args, cls, message): # Github issue 8197. with pytest.raises(cls, match=re.escape(message)): > mpl._contour.QuadContourGenerator(*args) E AttributeError: module 'matplotlib' has no attribute '_contour' lib/matplotlib/tests/test_contour.py:269: AttributeError This is a corollary to b672f68 for tri.
diff --git a/lib/matplotlib/tests/test_contour.py b/lib/matplotlib/tests/test_contour.py
@@ -265,11 +265,13 @@ def test_contourf_symmetric_locator():
      'If mask is set it must be a 2D array with the same dimensions as x.'),
 ])
 def test_internal_cpp_api(args, cls, message):  # Github issue 8197.
+    from matplotlib import _contour  # noqa: ensure lazy-loaded module *is* loaded.
     with pytest.raises(cls, match=re.escape(message)):
         mpl._contour.QuadContourGenerator(*args)
 
 
 def test_internal_cpp_api_2():
+    from matplotlib import _contour  # noqa: ensure lazy-loaded module *is* loaded.
     arr = [[0, 1], [2, 3]]
     qcg = mpl._contour.QuadContourGenerator(arr, arr, arr, None, True, 0)
     with pytest.raises(
