Skip to content

TST(string dtype): Remove xfail for combine_first #60634

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 2, 2025
Merged

TST(string dtype): Remove xfail for combine_first #60634

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions pandas/tests/frame/methods/test_combine_first.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
import numpy as np
import pytest

from pandas._config import using_string_dtype

from pandas.core.dtypes.cast import find_common_type
from pandas.core.dtypes.common import is_dtype_equal

Expand Down Expand Up @@ -32,8 +30,7 @@ def test_combine_first_mixed(self):
combined = f.combine_first(g)
tm.assert_frame_equal(combined, exp)

@pytest.mark.xfail(using_string_dtype(), reason="TODO(infer_string)")
def test_combine_first(self, float_frame, using_infer_string):
def test_combine_first(self, float_frame):
# disjoint
head, tail = float_frame[:5], float_frame[5:]

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

# corner cases
warning = FutureWarning if using_infer_string else None
with tm.assert_produces_warning(warning, match="empty entries"):
comb = float_frame.combine_first(DataFrame())
comb = float_frame.combine_first(DataFrame())
tm.assert_frame_equal(comb, float_frame)

comb = DataFrame().combine_first(float_frame)
Expand Down
Loading