Skip to content

Commit 93baa93

Browse files
committed
Feedback from code review
1 parent f89c29c commit 93baa93

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

pandas/tests/reshape/merge/test_merge_asof.py

+2-4
Original file line numberDiff line numberDiff line change
@@ -994,8 +994,7 @@ def test_on_float_by_int(self):
994994

995995
assert_frame_equal(result, expected)
996996

997-
def test_merge_datatype_error(self):
998-
""" Tests merge datatype mismatch error """
997+
def test_merge_datatype_error_raises(self):
999998
msg = r'merge keys \[0\] object and int64, must be the same type'
1000999

10011000
left = pd.DataFrame({'left_val': [1, 5, 10],
@@ -1006,8 +1005,7 @@ def test_merge_datatype_error(self):
10061005
with pytest.raises(MergeError, match=msg):
10071006
merge_asof(left, right, on='a')
10081007

1009-
def test_merge_datatype_categorical_error(self):
1010-
""" Tests merge datatype mismatch error """
1008+
def test_merge_datatype_categorical_error_raises(self):
10111009
msg = r'merge keys \[0\] both sides category, but not equal ones'
10121010

10131011
left = pd.DataFrame({'left_val': [1, 5, 10],

0 commit comments

Comments
 (0)