Skip to content

Commit a4f6e14

Browse files
rhshadrachgmcrocetti
authored andcommitted
TST(string dtype): Remove xfail for combine_first (pandas-dev#60634)
1 parent de8809f commit a4f6e14

File tree

1 file changed

+2
-7
lines changed

1 file changed

+2
-7
lines changed

pandas/tests/frame/methods/test_combine_first.py

+2-7
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import numpy as np
44
import pytest
55

6-
from pandas._config import using_string_dtype
7-
86
from pandas.core.dtypes.cast import find_common_type
97
from pandas.core.dtypes.common import is_dtype_equal
108

@@ -32,8 +30,7 @@ def test_combine_first_mixed(self):
3230
combined = f.combine_first(g)
3331
tm.assert_frame_equal(combined, exp)
3432

35-
@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
36-
def test_combine_first(self, float_frame, using_infer_string):
33+
def test_combine_first(self, float_frame):
3734
# disjoint
3835
head, tail = float_frame[:5], float_frame[5:]
3936

@@ -79,9 +76,7 @@ def test_combine_first(self, float_frame, using_infer_string):
7976
tm.assert_series_equal(combined["A"].reindex(g.index), g["A"])
8077

8178
# corner cases
82-
warning = FutureWarning if using_infer_string else None
83-
with tm.assert_produces_warning(warning, match="empty entries"):
84-
comb = float_frame.combine_first(DataFrame())
79+
comb = float_frame.combine_first(DataFrame())
8580
tm.assert_frame_equal(comb, float_frame)
8681

8782
comb = DataFrame().combine_first(float_frame)

0 commit comments

Comments
 (0)