Skip to content

Commit c28394a

Browse files
committed
TST: code moved to test_indexing
1 parent 36528d5 commit c28394a

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

pandas/tests/frame/test_indexing.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1548,6 +1548,14 @@ def test_setitem_single_column_mixed_datetime(self):
15481548
# pytest.raises(
15491549
# Exception, df.loc.__setitem__, ('d', 'timestamp'), [nan])
15501550

1551+
def test_setitem_mixed_datetime(self):
1552+
# GH 9336
1553+
expected = DataFrame({'date': [1, 'a', 'b']})
1554+
df = DataFrame({'date': Series(pd.NaT, range(3))})
1555+
df.loc[0, 'date'] = 1
1556+
df.loc[1:2, 'date'] = 'a', 'b'
1557+
tm.assert_frame_equal(df, expected)
1558+
15511559
def test_setitem_frame(self):
15521560
piece = self.frame.loc[self.frame.index[:2], ['A', 'B']]
15531561
self.frame.loc[self.frame.index[-2]:, ['A', 'B']] = piece.values

pandas/tests/indexing/test_loc.py

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -444,13 +444,6 @@ def test_loc_setitem_consistency(self):
444444
expected = DataFrame({'date': Series(['string'])})
445445
tm.assert_frame_equal(df, expected)
446446

447-
# GH 9336
448-
expected = DataFrame({'date': [1, 'a', 'b']})
449-
df = DataFrame({'date': Series(pd.NaT, range(3))})
450-
df.loc[0, 'date'] = 1
451-
df.loc[1:2, 'date'] = 'a', 'b'
452-
tm.assert_frame_equal(df, expected)
453-
454447
def test_loc_setitem_consistency_empty(self):
455448
# empty (essentially noops)
456449
expected = DataFrame(columns=['x', 'y'])

0 commit comments

Comments
 (0)