Skip to content

Commit 7b78b73

Browse files
authored
TST: de-xfail (#44659)
1 parent 9f23f3f commit 7b78b73

File tree

3 files changed

+4
-29
lines changed

3 files changed

+4
-29
lines changed

pandas/tests/frame/test_reductions.py

+1-5
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,9 @@ def wrapper(x):
9393
tm.assert_series_equal(
9494
result0, frame.apply(wrapper), check_dtype=check_dtype, rtol=rtol, atol=atol
9595
)
96-
# FIXME: HACK: win32
9796
tm.assert_series_equal(
9897
result1,
9998
frame.apply(wrapper, axis=1),
100-
check_dtype=False,
10199
rtol=rtol,
102100
atol=atol,
103101
)
@@ -200,9 +198,7 @@ def wrapper(x):
200198
result1 = f(axis=1, skipna=False)
201199

202200
tm.assert_series_equal(result0, frame.apply(wrapper))
203-
tm.assert_series_equal(
204-
result1, frame.apply(wrapper, axis=1), check_dtype=False
205-
) # FIXME: HACK: win32
201+
tm.assert_series_equal(result1, frame.apply(wrapper, axis=1))
206202
else:
207203
skipna_wrapper = alternative
208204
wrapper = alternative

pandas/tests/indexes/datetimes/test_indexing.py

-4
Original file line numberDiff line numberDiff line change
@@ -651,10 +651,6 @@ def test_get_indexer_mixed_dtypes(self, target):
651651
([date(9999, 1, 1), date(9999, 1, 1)], [-1, -1]),
652652
],
653653
)
654-
# FIXME: these warnings are flaky GH#36131
655-
@pytest.mark.filterwarnings(
656-
"ignore:Comparison of Timestamp with datetime.date:FutureWarning"
657-
)
658654
def test_get_indexer_out_of_bounds_date(self, target, positions):
659655
values = DatetimeIndex([Timestamp("2020-01-01"), Timestamp("2020-01-02")])
660656

pandas/tests/io/parser/common/test_chunksize.py

+3-20
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ def test_chunk_begins_with_newline_whitespace(all_parsers):
162162

163163

164164
@pytest.mark.slow
165-
@pytest.mark.xfail(reason="GH38630, sometimes gives ResourceWarning", strict=False)
166165
def test_chunks_have_consistent_numerical_type(all_parsers):
167166
parser = all_parsers
168167
integers = [str(i) for i in range(499999)]
@@ -176,7 +175,7 @@ def test_chunks_have_consistent_numerical_type(all_parsers):
176175
assert result.a.dtype == float
177176

178177

179-
def test_warn_if_chunks_have_mismatched_type(all_parsers, request):
178+
def test_warn_if_chunks_have_mismatched_type(all_parsers):
180179
warning_type = None
181180
parser = all_parsers
182181
size = 10000
@@ -193,24 +192,8 @@ def test_warn_if_chunks_have_mismatched_type(all_parsers, request):
193192

194193
buf = StringIO(data)
195194

196-
try:
197-
with tm.assert_produces_warning(warning_type):
198-
df = parser.read_csv(buf)
199-
except AssertionError as err:
200-
# 2021-02-21 this occasionally fails on the CI with an unexpected
201-
# ResourceWarning that we have been unable to track down,
202-
# see GH#38630
203-
if "ResourceWarning" not in str(err) or parser.engine != "python":
204-
raise
205-
206-
# Check the main assertion of the test before re-raising
207-
assert df.a.dtype == object
208-
209-
mark = pytest.mark.xfail(
210-
reason="ResourceWarning for unclosed SSL Socket, GH#38630"
211-
)
212-
request.node.add_marker(mark)
213-
raise
195+
with tm.assert_produces_warning(warning_type):
196+
df = parser.read_csv(buf)
214197

215198
assert df.a.dtype == object
216199

0 commit comments

Comments
 (0)