TST: clean up to change setup.cfg to xfail_strict = True (GH23057) (pandas-dev#23721)

Author: dcreekp

pandas/tests/arithmetic/conftest.py

@@ -154,7 +154,7 @@ def box(request):
 @pytest.fixture(params=[pd.Index,
                         pd.Series,
                         pytest.param(pd.DataFrame,
-                                     marks=pytest.mark.xfail(strict=True))],
+                                     marks=pytest.mark.xfail)],
                 ids=id_func)
 def box_df_fail(request):
     """
@@ -167,7 +167,7 @@ def box_df_fail(request):
                         (pd.Series, False),
                         (pd.DataFrame, False),
                         pytest.param((pd.DataFrame, True),
-                                     marks=pytest.mark.xfail(strict=True))],
+                                     marks=pytest.mark.xfail)],
                 ids=id_func)
 def box_transpose_fail(request):
     """

pandas/tests/arithmetic/test_numeric.py

@@ -407,7 +407,7 @@ class TestMultiplicationDivision(object):
         pytest.param(pd.Index,
                      marks=pytest.mark.xfail(reason="Index.__div__ always "
                                                     "raises",
-                                             raises=TypeError, strict=True)),
+                                             raises=TypeError)),
         pd.Series,
         pd.DataFrame
     ], ids=lambda x: x.__name__)

pandas/tests/arithmetic/test_object.py

@@ -92,7 +92,7 @@ def test_add_extension_scalar(self, other, box, op):
     @pytest.mark.parametrize('box', [
         pytest.param(pd.Index,
                      marks=pytest.mark.xfail(reason="Does not mask nulls",
-                                             strict=True, raises=TypeError)),
+                                             raises=TypeError)),
         pd.Series,
         pd.DataFrame
     ], ids=lambda x: x.__name__)
@@ -109,7 +109,7 @@ def test_objarr_add_str(self, box):
     @pytest.mark.parametrize('box', [
         pytest.param(pd.Index,
                      marks=pytest.mark.xfail(reason="Does not mask nulls",
-                                             strict=True, raises=TypeError)),
+                                             raises=TypeError)),
         pd.Series,
         pd.DataFrame
     ], ids=lambda x: x.__name__)

pandas/tests/arrays/categorical/test_constructors.py

@@ -538,8 +538,7 @@ def test_construction_with_ordered(self):
         cat = Categorical([0, 1, 2], ordered=True)
         assert cat.ordered
 
-    @pytest.mark.xfail(reason="Imaginary values not supported in Categorical",
-                       strict=True)
+    @pytest.mark.xfail(reason="Imaginary values not supported in Categorical")
     def test_constructor_imaginary(self):
         values = [1, 2, 3 + 1j]
         c1 = Categorical(values)

pandas/tests/arrays/sparse/test_array.py

@@ -488,7 +488,7 @@ def test_astype_all(self, any_real_dtype):
             SparseArray(np.array([0, 1], dtype='datetime64[ns]'),
                         dtype=SparseDtype('datetime64[ns]',
                                           pd.Timestamp('1970'))),
-            marks=[pytest.mark.xfail(reason="NumPy-7619", strict=True)],
+            marks=[pytest.mark.xfail(reason="NumPy-7619")],
         ),
         (SparseArray([0, 1, 10]), str,
          SparseArray(['0', '1', '10'], dtype=SparseDtype(str, '0'))),

pandas/tests/extension/base/ops.py

@@ -72,8 +72,7 @@ def test_arith_series_with_scalar(self, data, all_arithmetic_operators):
         s = pd.Series(data)
         self.check_opname(s, op_name, s.iloc[0], exc=self.series_scalar_exc)
 
-    @pytest.mark.xfail(run=False, reason="_reduce needs implementation",
-                       strict=True)
+    @pytest.mark.xfail(run=False, reason="_reduce needs implementation")
     def test_arith_frame_with_scalar(self, data, all_arithmetic_operators):
         # frame & scalar
         op_name = all_arithmetic_operators

pandas/tests/extension/base/setitem.py

@@ -166,8 +166,7 @@ def test_setitem_frame_invalid_length(self, data):
         with pytest.raises(ValueError, match=xpr):
             df['B'] = data[:5]
 
-    @pytest.mark.xfail(reason="GH#20441: setitem on extension types.",
-                       strict=True)
+    @pytest.mark.xfail(reason="GH#20441: setitem on extension types.")
     def test_setitem_tuple_index(self, data):
         s = pd.Series(data[:2], index=[(0, 0), (0, 1)])
         expected = pd.Series(data.take([1, 1]), index=s.index)

pandas/tests/extension/json/test_json.py

@@ -148,7 +148,7 @@ def test_stack(self):
         rows since we consider `{}` NA, but `.astype(object)` doesn't.
         """
 
-    @pytest.mark.xfail(reason="dict for NA", strict=True)
+    @pytest.mark.xfail(reason="dict for NA")
     def test_unstack(self, data, index):
         # The base test has NaN for the expected NA value.
         # this matches otherwise

pandas/tests/extension/test_categorical.py

@@ -72,7 +72,7 @@ class TestDtype(base.BaseDtypeTests):
 
 
 class TestInterface(base.BaseInterfaceTests):
-    @pytest.mark.skip(reason="Memory usage doesn't match", strict=True)
+    @pytest.mark.skip(reason="Memory usage doesn't match")
     def test_memory_usage(self, data):
         # Is this deliberate?
         super(TestInterface, self).test_memory_usage(data)
@@ -87,9 +87,9 @@ class TestReshaping(base.BaseReshapingTests):
 
 
 class TestGetitem(base.BaseGetitemTests):
-    skip_take = pytest.mark.skip(reason="GH-20664.", strict=True)
+    skip_take = pytest.mark.skip(reason="GH-20664.")
 
-    @pytest.mark.skip(reason="Backwards compatibility", strict=True)
+    @pytest.mark.skip(reason="Backwards compatibility")
     def test_getitem_scalar(self, data):
         # CategoricalDtype.type isn't "correct" since it should
         # be a parent of the elements (object). But don't want
@@ -117,20 +117,19 @@ def test_take_non_na_fill_value(self, data_missing):
     def test_take_out_of_bounds_raises(self, data, allow_fill):
         return super().test_take_out_of_bounds_raises(data, allow_fill)
 
-    @pytest.mark.skip(reason="GH-20747. Unobserved categories.", strict=True)
+    @pytest.mark.skip(reason="GH-20747. Unobserved categories.")
     def test_take_series(self, data):
         super().test_take_series(data)
 
     @skip_take
     def test_reindex_non_na_fill_value(self, data_missing):
         super().test_reindex_non_na_fill_value(data_missing)
 
-    @pytest.mark.skip(reason="Categorical.take buggy", strict=True)
+    @pytest.mark.skip(reason="Categorical.take buggy")
     def test_take_empty(self, data, na_value, na_cmp):
         super().test_take_empty(data, na_value, na_cmp)
 
-    @pytest.mark.skip(reason="test not written correctly for categorical",
-                      strict=True)
+    @pytest.mark.skip(reason="test not written correctly for categorical")
     def test_reindex(self, data, na_value):
         super().test_reindex(data, na_value)
 
@@ -141,11 +140,11 @@ class TestSetitem(base.BaseSetitemTests):
 
 class TestMissing(base.BaseMissingTests):
 
-    @pytest.mark.skip(reason="Not implemented", strict=True)
+    @pytest.mark.skip(reason="Not implemented")
     def test_fillna_limit_pad(self, data_missing):
         super().test_fillna_limit_pad(data_missing)
 
-    @pytest.mark.skip(reason="Not implemented", strict=True)
+    @pytest.mark.skip(reason="Not implemented")
     def test_fillna_limit_backfill(self, data_missing):
         super().test_fillna_limit_backfill(data_missing)
 
@@ -155,7 +154,7 @@ class TestReduce(base.BaseNoReduceTests):
 
 
 class TestMethods(base.BaseMethodsTests):
-    @pytest.mark.skip(reason="Unobserved categories included", strict=True)
+    @pytest.mark.skip(reason="Unobserved categories included")
     def test_value_counts(self, all_data, dropna):
         return super().test_value_counts(all_data, dropna)
 
@@ -175,7 +174,7 @@ def test_combine_add(self, data_repeated):
         expected = pd.Series([a + val for a in list(orig_data1)])
         self.assert_series_equal(result, expected)
 
-    @pytest.mark.skip(reason="Not Applicable", strict=True)
+    @pytest.mark.skip(reason="Not Applicable")
     def test_fillna_length_mismatch(self, data_missing):
         super().test_fillna_length_mismatch(data_missing)
 

pandas/tests/frame/test_combine_concat.py

@@ -77,8 +77,7 @@ def test_concat_multiple_tzs(self):
         [
             '2015-01-01',
             pytest.param(pd.NaT, marks=pytest.mark.xfail(
-                reason='GH23037 incorrect dtype when concatenating',
-                strict=True))])
+                reason='GH23037 incorrect dtype when concatenating'))])
     def test_concat_tz_NaT(self, t1):
         # GH 22796
         # Concating tz-aware multicolumn DataFrames