Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

TST: Remove bare pytest.raises #31079

Merged
merged 11 commits into from
Jan 24, 2020
Merged

TST: Remove bare pytest.raises #31079

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e3cff7b
TST: Remove bare pytest.raises in tests/arithmetic/test_object.py
gdex1 Jan 16, 2020
924e6e8
Add error message option to test_object.py
gdex1 Jan 16, 2020
a8f9bc6
TST: Remove bare pytest.raises in tests/arithmetic/test_numeric.py
gdex1 Jan 16, 2020
b9986c2
TST: Remove bare pytest.raises in tests/arithmetic/test_timedelta64.py
gdex1 Jan 16, 2020
0f0f37f
Add TODO for uninformative errors
gdex1 Jan 17, 2020
fd2c142
Shorten error match strings
gdex1 Jan 17, 2020
a5856d2
Fix lint error
gdex1 Jan 17, 2020
e0ed317
TST: Remove bare pytest.raises in tests/arithemtic/test_object.py
gdex1 Jan 17, 2020
be109b2
Improved error messge of masked_arith_op
gdex1 Jan 18, 2020
b2a2cf6
Change error message to f-string
gdex1 Jan 20, 2020
e0b8d4e
Retrigger CI checks
gdex1 Jan 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions pandas/tests/arithmetic/test_object.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,9 +155,10 @@ def test_objarr_add_invalid(self, op, box_with_array):
obj_ser.name = "objects"

obj_ser = tm.box_expected(obj_ser, box)
with pytest.raises(Exception):
msg = "can only concatenate str|unsupported operand type"
with pytest.raises(Exception, match=msg):
op(obj_ser, 1)
with pytest.raises(Exception):
with pytest.raises(Exception, match=msg):
op(obj_ser, np.array(1, dtype=np.int64))

# TODO: Moved from tests.series.test_operators; needs cleanup
Expand Down Expand Up @@ -281,13 +282,14 @@ def test_add(self):

def test_sub_fail(self):
index = tm.makeStringIndex(100)
with pytest.raises(TypeError):
msg = "unsupported operand type|<class 'list'>" # Error for index.toList()-list is uninformative?
with pytest.raises(TypeError, match=msg):
index - "a"
with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
index - index
with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
index - index.tolist()
with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
index.tolist() - index
gdex1 marked this conversation as resolved.
Show resolved Hide resolved

def test_sub_object(self):
Expand All @@ -301,10 +303,11 @@ def test_sub_object(self):
result = index - pd.Index([Decimal(1), Decimal(1)])
tm.assert_index_equal(result, expected)

with pytest.raises(TypeError):
msg = "unsupported operand type"
with pytest.raises(TypeError, match=msg):
index - "foo"

with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
index - np.array([2, "foo"])

def test_rsub_object(self):
Expand All @@ -318,8 +321,9 @@ def test_rsub_object(self):
result = np.array([Decimal(2), Decimal(2)]) - index
tm.assert_index_equal(result, expected)

with pytest.raises(TypeError):
msg = "unsupported operand type"
with pytest.raises(TypeError, match=msg):
"foo" - index

with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
np.array([True, pd.Timestamp.now()]) - index