@@ -175,7 +175,6 @@ def test_modulo(self):
175
175
expected = Index (index .values % 2 )
176
176
tm .assert_index_equal (index % 2 , expected )
177
177
178
- < << << << HEAD
179
178
@pytest .mark .parametrize ('klass' , [list , tuple , np .array , Series ])
180
179
def test_where (self , klass ):
181
180
i = self .create_index ()
@@ -187,14 +186,13 @@ def test_where(self, klass):
187
186
expected = Float64Index ([i ._na_value ] + i [1 :].tolist ())
188
187
result = i .where (klass (cond ))
189
188
tm .assert_index_equal (result , expected )
190
- == == == =
189
+
191
190
def test_insert (self ):
192
191
# GH 18295 (test missing)
193
192
expected = Float64Index ([0 , np .nan , 1 , 2 , 3 , 4 ])
194
193
for na in (np .nan , pd .NaT , None ):
195
194
result = self .create_index ().insert (1 , na )
196
195
tm .assert_index_equal (result , expected )
197
- >> >> >> > Generalize NA Compat
198
196
199
197
200
198
class TestFloat64Index (Numeric ):
@@ -1202,10 +1200,3 @@ def test_join_outer(self):
1202
1200
tm .assert_index_equal (res , eres )
1203
1201
tm .assert_numpy_array_equal (lidx , elidx )
1204
1202
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