Merge pull request #13953 from anntzer/catxfail

timhoffm · web-flow · commit 93519e0a1304 · 2019-04-14T20:02:03.000+02:00
Unxfail a now fixed test in test_category.
diff --git a/lib/matplotlib/tests/test_category.py b/lib/matplotlib/tests/test_category.py
@@ -255,19 +255,16 @@ def test_update_plot(self, ax, plotter):
 
     fids, fvalues = zip(*failing_test_cases)
 
-    PLOT_BROKEN_LIST = [Axes.scatter,
-                        pytest.param(Axes.plot, marks=pytest.mark.xfail),
-                        pytest.param(Axes.bar, marks=pytest.mark.xfail)]
+    plotters = [Axes.scatter, Axes.bar,
+                pytest.param(Axes.plot, marks=pytest.mark.xfail)]
 
-    PLOT_BROKEN_IDS = ["scatter", "plot", "bar"]
-
-    @pytest.mark.parametrize("plotter", PLOT_BROKEN_LIST, ids=PLOT_BROKEN_IDS)
+    @pytest.mark.parametrize("plotter", plotters)
     @pytest.mark.parametrize("xdata", fvalues, ids=fids)
     def test_mixed_type_exception(self, ax, plotter, xdata):
         with pytest.raises(TypeError):
             plotter(ax, xdata, [1, 2])
 
-    @pytest.mark.parametrize("plotter", PLOT_BROKEN_LIST, ids=PLOT_BROKEN_IDS)
+    @pytest.mark.parametrize("plotter", plotters)
     @pytest.mark.parametrize("xdata", fvalues, ids=fids)
     def test_mixed_type_update_exception(self, ax, plotter, xdata):
         with pytest.raises(TypeError):
