TST: fix test for raise

jklymak · jklymak · commit 520694cbde24 · 2022-01-08T10:15:50.000+01:00
diff --git a/doc/api/next_api_changes/behavior/20426-JK.rst b/doc/api/next_api_changes/behavior/20426-JK.rst
@@ -1,5 +1,5 @@
 Incompatible layout engines raise
 ---------------------------------
-`tight_layout` and `constrained_layout` are incompatible if
+``tight_layout`` and ``constrained_layout`` are incompatible if
 a colorbar has been added to the figure.  Invoking the incompatible layout
 engine used to warn, but now raises with a ``RuntimeError``.
diff --git a/doc/users/next_whats_new/layout_engine.rst b/doc/users/next_whats_new/layout_engine.rst
@@ -1,6 +1,7 @@
 New ``layout_engine`` module
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
 Matplotlib ships with ``tight_layout`` and ``constrained_layout`` layout
 engines.  A new ``layout_engine`` module is provided to allow downstream
-libraries to write their own layout engines and `.figure` objects can not take
-a `.LayoutEngine` subclass as an argument to the *layout* parameter.
+libraries to write their own layout engines and `~.Figure.figure` objects can
+not take a `.LayoutEngine` subclass as an argument to the *layout* parameter.
diff --git a/lib/matplotlib/tests/test_figure.py b/lib/matplotlib/tests/test_figure.py
@@ -610,18 +610,14 @@ def test_invalid_layouts():
     fig, ax = plt.subplots(layout="constrained")
     pc = ax.pcolormesh(np.random.randn(2, 2))
     fig.colorbar(pc)
-    with pytest.warns(UserWarning, match='Colorbar layout of new layout'):
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
         fig.set_layout_engine("tight")
-    # check that engine didn't change
-    assert isinstance(fig.get_layout_engine(), ConstrainedLayoutEngine)
 
     fig, ax = plt.subplots(layout="tight")
     pc = ax.pcolormesh(np.random.randn(2, 2))
     fig.colorbar(pc)
-    with pytest.warns(UserWarning, match='Colorbar layout of new layout'):
+    with pytest.raises(RuntimeError, match='Colorbar layout of new layout'):
         fig.set_layout_engine("constrained")
-    # check that engine didn't change
-    assert isinstance(fig.get_layout_engine(), TightLayoutEngine)
 
 
 @check_figures_equal(extensions=["png", "pdf"])
@@ -1039,8 +1035,6 @@ def test_subfigure():
     sub[0].colorbar(pc, ax=axs)
     sub[0].suptitle('Left Side')
 
-    dsadsa
-
     axs = sub[1].subplots(1, 3)
     for ax in axs.flat:
         pc = ax.pcolormesh(np.random.randn(30, 30), vmin=-2, vmax=2)
