Skip to content

Commit e401032

Browse files
committed
correct test_insert for UInt64Index
1 parent 3e336e1 commit e401032

File tree

1 file changed

+1
-10
lines changed

1 file changed

+1
-10
lines changed

pandas/tests/indexes/test_numeric.py

+1-10
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ def test_modulo(self):
175175
expected = Index(index.values % 2)
176176
tm.assert_index_equal(index % 2, expected)
177177

178-
<<<<<<< HEAD
179178
@pytest.mark.parametrize('klass', [list, tuple, np.array, Series])
180179
def test_where(self, klass):
181180
i = self.create_index()
@@ -187,14 +186,13 @@ def test_where(self, klass):
187186
expected = Float64Index([i._na_value] + i[1:].tolist())
188187
result = i.where(klass(cond))
189188
tm.assert_index_equal(result, expected)
190-
=======
189+
191190
def test_insert(self):
192191
# GH 18295 (test missing)
193192
expected = Float64Index([0, np.nan, 1, 2, 3, 4])
194193
for na in (np.nan, pd.NaT, None):
195194
result = self.create_index().insert(1, na)
196195
tm.assert_index_equal(result, expected)
197-
>>>>>>> Generalize NA Compat
198196

199197

200198
class TestFloat64Index(Numeric):
@@ -1202,10 +1200,3 @@ def test_join_outer(self):
12021200
tm.assert_index_equal(res, eres)
12031201
tm.assert_numpy_array_equal(lidx, elidx)
12041202
tm.assert_numpy_array_equal(ridx, eridx)
1205-
1206-
def test_insert(self):
1207-
# GH 18295 (test missing)
1208-
expected = UInt64Index([0, 0, 1, 2, 3, 4])
1209-
for na in (np.nan, pd.NaT, None):
1210-
result = self.create_index().insert(1, na)
1211-
tm.assert_index_equal(result, expected)

0 commit comments

Comments
 (0)