Skip to content

Commit 6124e13

Browse files
committed
Merge pull request #3313 from jreback/GH3235_test
TST: test fix on GH3235 (failing because of system dtype on different sy...
2 parents d749b91 + fc8a679 commit 6124e13

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

pandas/tests/test_series.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1154,17 +1154,17 @@ def test_where(self):
11541154
self.assertRaises(Exception, s.__setitem__, tuple(mask), values)
11551155

11561156
# GH3235
1157-
s = Series(np.arange(10))
1157+
s = Series(np.arange(10),dtype='int64')
11581158
mask = s < 5
11591159
s[mask] = range(2,7)
1160-
expected = Series(range(2,7) + range(5,10))
1160+
expected = Series(range(2,7) + range(5,10),dtype='int64')
11611161
assert_series_equal(s, expected)
11621162
self.assertEquals(s.dtype, expected.dtype)
11631163

1164-
s = Series(np.arange(10))
1164+
s = Series(np.arange(10),dtype='int64')
11651165
mask = s > 5
11661166
s[mask] = [0]*4
1167-
expected = Series([0,1,2,3,4,5] + [0]*4)
1167+
expected = Series([0,1,2,3,4,5] + [0]*4,dtype='int64')
11681168
assert_series_equal(s,expected)
11691169

11701170
s = Series(np.arange(10))

0 commit comments

Comments
 (0)