Skip to content

Commit 09d7ac3

Browse files
committed
CLN/TST: call assert_almost_equal() when comparing Series/DataFrames
Removed previously defined helper method assert_series_or_frame_equal(), which behaved identical to assert_almost_equal()
1 parent b9819ca commit 09d7ac3

File tree

1 file changed

+2
-9
lines changed

1 file changed

+2
-9
lines changed

pandas/tests/test_resample.py

+2-9
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,6 @@ def _simple_pts(start, end, freq='D'):
5050
return Series(np.random.randn(len(rng)), index=rng)
5151

5252

53-
def assert_series_or_frame_equal(result, expected):
54-
if isinstance(result, Series):
55-
return assert_series_equal(result, expected)
56-
elif isinstance(result, DataFrame):
57-
return assert_frame_equal(result, expected)
58-
59-
6053
class TestResampleAPI(object):
6154

6255
def setup_method(self, method):
@@ -2225,7 +2218,7 @@ def test_asfreq_downsample(self, series_and_frame, freq, kind):
22252218
closed='left')
22262219
expected = obj.to_timestamp().reindex(new_index).to_period(freq)
22272220
result = obj.resample(freq, kind=kind).asfreq()
2228-
assert_series_or_frame_equal(result, expected)
2221+
assert_almost_equal(result, expected)
22292222

22302223
@pytest.mark.parametrize('freq', ['1H', '2H'])
22312224
@pytest.mark.parametrize('kind', ['period', None, 'timestamp'])
@@ -2241,7 +2234,7 @@ def test_asfreq_upsample(self, series_and_frame, freq, kind):
22412234
closed='left')
22422235
expected = obj.to_timestamp().reindex(new_index).to_period(freq)
22432236
result = obj.resample(freq, kind=kind).asfreq()
2244-
assert_series_or_frame_equal(result, expected)
2237+
assert_almost_equal(result, expected)
22452238

22462239
def test_asfreq_fill_value(self):
22472240
# test for fill value during resampling, issue 3715

0 commit comments

Comments
 (0)