Skip to content

Commit 3128215

Browse files
committed
cleanup test for GH10044
1 parent c0d4339 commit 3128215

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

pandas/tests/test_groupby.py

+2-12
Original file line numberDiff line numberDiff line change
@@ -966,16 +966,6 @@ def demean(arr):
966966
expected = DataFrame({'b' : range(5)})
967967
tm.assert_frame_equal(result, expected)
968968

969-
def test_resample_extra_index_point(self):
970-
# GH 9756
971-
expected_i = pd.DatetimeIndex(start='20150101', end='20150331', freq='BM')
972-
expected = pd.DataFrame(index=expected_i, data=len(expected_i)*[0])
973-
974-
index = pd.DatetimeIndex(start='20150101', end='20150331', freq='B')
975-
df = pd.DataFrame(index=index, data=len(index)*[0])
976-
result = df.resample('BM', how='last')
977-
assert_frame_equal(result, expected)
978-
979969
def test_transform_fast(self):
980970

981971
df = DataFrame( { 'id' : np.arange( 100000 ) / 3,
@@ -5108,10 +5098,10 @@ def test_groupby_categorical_two_columns(self):
51085098
tm.assert_frame_equal(res, exp)
51095099

51105100
def test_groupby_apply_all_none(self):
5111-
# Tests to make sure no errors if apply function returns all None
5101+
# Tests to make sure no errors if apply function returns all None
51125102
# values. Issue 9684.
51135103
test_df = DataFrame({'groups': [0,0,1,1], 'random_vars': [8,7,4,5]})
5114-
5104+
51155105
def test_func(x):
51165106
pass
51175107
result = test_df.groupby('groups').apply(test_func)

pandas/tseries/tests/test_resample.py

+10
Original file line numberDiff line numberDiff line change
@@ -378,6 +378,16 @@ def test_resample_upsample(self):
378378

379379
self.assertEqual(result.index.name, 'index')
380380

381+
def test_resample_extra_index_point(self):
382+
# GH 9756
383+
index = DatetimeIndex(start='20150101', end='20150331', freq='BM')
384+
expected = DataFrame({'A' : Series([21,41,63], index=index)})
385+
386+
index = DatetimeIndex(start='20150101', end='20150331', freq='B')
387+
df = DataFrame({'A' : Series(range(len(index)),index=index)})
388+
result = df.resample('BM', how='last')
389+
assert_frame_equal(result, expected)
390+
381391
def test_upsample_with_limit(self):
382392
rng = date_range('1/1/2000', periods=3, freq='5t')
383393
ts = Series(np.random.randn(len(rng)), rng)

0 commit comments

Comments
 (0)