xpass -> skip

pandas-dev · Oct 4, 2018 · c9d6e89 · c9d6e89
1 parent 95d5cbf
commit c9d6e89
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/pandas/tests/extension/decimal/test_decimal.py b/pandas/tests/extension/decimal/test_decimal.py
@@ -102,7 +102,7 @@ class TestInterface(BaseDecimal, base.BaseInterfaceTests):
 
 class TestConstructors(BaseDecimal, base.BaseConstructorsTests):
 
-    @pytest.mark.xfail(reason="not implemented constructor from dtype")
+    @pytest.mark.skip(reason="not implemented constructor from dtype")
     def test_from_dtype(self, data):
         # construct from our dtype & string dtype
         pass

diff --git a/pandas/tests/extension/json/test_json.py b/pandas/tests/extension/json/test_json.py
@@ -131,8 +131,7 @@ def test_custom_asserts(self):
 
 class TestConstructors(BaseJSON, base.BaseConstructorsTests):
 
-    # TODO: Should this be pytest.mark.skip?
-    @pytest.mark.xfail(reason="not implemented constructor from dtype")
+    @pytest.mark.skip(reason="not implemented constructor from dtype")
     def test_from_dtype(self, data):
         # construct from our dtype & string dtype
         pass
@@ -147,13 +146,11 @@ class TestGetitem(BaseJSON, base.BaseGetitemTests):
 
 
 class TestMissing(BaseJSON, base.BaseMissingTests):
-    # TODO: Should this be pytest.mark.skip?
-    @pytest.mark.xfail(reason="Setting a dict as a scalar")
+    @pytest.mark.skip(reason="Setting a dict as a scalar")
     def test_fillna_series(self):
         """We treat dictionaries as a mapping in fillna, not a scalar."""
 
-    # TODO: Should this be pytest.mark.skip?
-    @pytest.mark.xfail(reason="Setting a dict as a scalar")
+    @pytest.mark.skip(reason="Setting a dict as a scalar")
     def test_fillna_frame(self):
         """We treat dictionaries as a mapping in fillna, not a scalar."""
 
@@ -204,8 +201,7 @@ def test_combine_add(self, data_repeated):
 
 
 class TestCasting(BaseJSON, base.BaseCastingTests):
-    # TODO: Should this be pytest.mark.skip?
-    @pytest.mark.xfail(reason="failing on np.array(self, dtype=str)")
+    @pytest.mark.skip(reason="failing on np.array(self, dtype=str)")
     def test_astype_str(self):
         """This currently fails in NumPy on np.array(self, dtype=str) with
 

diff --git a/pandas/tests/extension/test_categorical.py b/pandas/tests/extension/test_categorical.py
@@ -140,11 +140,11 @@ def test_take_series(self):
     def test_reindex_non_na_fill_value(self):
         pass
 
-    @pytest.mark.xfail(reason="Categorical.take buggy")
+    @pytest.mark.skip(reason="Categorical.take buggy")
     def test_take_empty(self):
         pass
 
-    @pytest.mark.xfail(reason="test not written correctly for categorical")
+    @pytest.mark.skip(reason="test not written correctly for categorical")
     def test_reindex(self):
         pass