@@ -53,13 +53,6 @@ def _simple_pts(start, end, freq='D'):
53
53
return Series (np .random .randn (len (rng )), index = rng )
54
54
55
55
56
- def assert_series_or_frame_equal (result , expected ):
57
- if isinstance (result , Series ):
58
- return assert_series_equal (result , expected )
59
- elif isinstance (result , DataFrame ):
60
- return assert_frame_equal (result , expected )
61
-
62
-
63
56
class TestResampleAPI (object ):
64
57
65
58
def setup_method (self , method ):
@@ -2271,7 +2264,7 @@ def test_asfreq_downsample(self, series_and_frame, freq, kind):
2271
2264
closed = 'left' )
2272
2265
expected = obj .to_timestamp ().reindex (new_index ).to_period (freq )
2273
2266
result = obj .resample (freq , kind = kind ).asfreq ()
2274
- assert_series_or_frame_equal (result , expected )
2267
+ assert_almost_equal (result , expected )
2275
2268
2276
2269
@pytest .mark .parametrize ('freq' , ['1H' , '2H' ])
2277
2270
@pytest .mark .parametrize ('kind' , ['period' , None , 'timestamp' ])
@@ -2287,7 +2280,7 @@ def test_asfreq_upsample(self, series_and_frame, freq, kind):
2287
2280
closed = 'left' )
2288
2281
expected = obj .to_timestamp ().reindex (new_index ).to_period (freq )
2289
2282
result = obj .resample (freq , kind = kind ).asfreq ()
2290
- assert_series_or_frame_equal (result , expected )
2283
+ assert_almost_equal (result , expected )
2291
2284
2292
2285
def test_asfreq_fill_value (self ):
2293
2286
# test for fill value during resampling, issue 3715
0 commit comments