Skip to content

Commit 737c00e

Browse files
ruiannjreback
authored andcommitted
move test to test time grouper
1 parent 3ce56bd commit 737c00e

File tree

2 files changed

+17
-17
lines changed

2 files changed

+17
-17
lines changed

pandas/tests/groupby/test_timegrouper.py

+17
Original file line numberDiff line numberDiff line change
@@ -623,3 +623,20 @@ def test_nunique_with_timegrouper_and_nat(self):
623623
result = test.groupby(grouper)['data'].nunique()
624624
expected = test[test.time.notnull()].groupby(grouper)['data'].nunique()
625625
tm.assert_series_equal(result, expected)
626+
627+
def test_scalar_call_versus_list_call(self):
628+
# Issue: 17530
629+
data_frame = {
630+
'location': ['shanghai', 'beijing', 'shanghai'],
631+
'time': pd.Series(['2017-08-09 13:32:23', '2017-08-11 23:23:15',
632+
'2017-08-11 22:23:15'],
633+
dtype='datetime64[ns]'),
634+
'value': [1, 2, 3]
635+
}
636+
data_frame = pd.DataFrame(data_frame).set_index('time')
637+
grouper = pd.TimeGrouper('D')
638+
grouped = data_frame.groupby(grouper)
639+
data1 = grouped.count()
640+
grouped = data_frame.groupby([grouper])
641+
data2 = grouped.count()
642+
assert_frame_equal(data1, data2)

pandas/tests/test_resample.py

-17
Original file line numberDiff line numberDiff line change
@@ -3380,20 +3380,3 @@ def test_aggregate_with_nat(self):
33803380

33813381
# if NaT is included, 'var', 'std', 'mean', 'first','last'
33823382
# and 'nth' doesn't work yet
3383-
3384-
# Issue: 17530
3385-
def test_scalar_call_versus_list_call(self):
3386-
data_frame = {
3387-
'location': ['shanghai', 'beijing', 'shanghai'],
3388-
'time': pd.Series(['2017-08-09 13:32:23', '2017-08-11 23:23:15',
3389-
'2017-08-11 22:23:15'],
3390-
dtype='datetime64[ns]'),
3391-
'value': [1, 2, 3]
3392-
}
3393-
data_frame = pd.DataFrame(data_frame).set_index('time')
3394-
grouper = TimeGrouper('D')
3395-
grouped = data_frame.groupby(grouper)
3396-
data1 = grouped.count()
3397-
grouped = data_frame.groupby([grouper])
3398-
data2 = grouped.count()
3399-
assert_frame_equal(data1, data2)

0 commit comments

Comments
 (0)