File tree Expand file tree Collapse file tree 1 file changed +2
-4
lines changed
pandas/tests/reshape/merge Expand file tree Collapse file tree 1 file changed +2
-4
lines changed Original file line number Diff line number Diff line change @@ -994,8 +994,7 @@ def test_on_float_by_int(self):
994
994
995
995
assert_frame_equal (result , expected )
996
996
997
- def test_merge_datatype_error (self ):
998
- """ Tests merge datatype mismatch error """
997
+ def test_merge_datatype_error_raises (self ):
999
998
msg = r'merge keys \[0\] object and int64, must be the same type'
1000
999
1001
1000
left = pd .DataFrame ({'left_val' : [1 , 5 , 10 ],
@@ -1006,8 +1005,7 @@ def test_merge_datatype_error(self):
1006
1005
with pytest .raises (MergeError , match = msg ):
1007
1006
merge_asof (left , right , on = 'a' )
1008
1007
1009
- def test_merge_datatype_categorical_error (self ):
1010
- """ Tests merge datatype mismatch error """
1008
+ def test_merge_datatype_categorical_error_raises (self ):
1011
1009
msg = r'merge keys \[0\] both sides category, but not equal ones'
1012
1010
1013
1011
left = pd .DataFrame ({'left_val' : [1 , 5 , 10 ],
You can’t perform that action at this time.
0 commit comments