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.

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

TST: Insert 'match' to bare pytest raises #30997

Merged
merged 9 commits into from
Jan 14, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 8 additions & 5 deletions pandas/tests/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,11 @@ def test_random_state():
assert com.random_state() is np.random

# Error for floats or strings
with pytest.raises(ValueError):
msg = "random_state must be an integer, a numpy RandomState, or None"
with pytest.raises(ValueError, match=msg):
com.random_state("test")

with pytest.raises(ValueError):
with pytest.raises(ValueError, match=msg):
com.random_state(5.5)


Expand Down Expand Up @@ -93,15 +94,17 @@ def test_dict_compat():

def test_standardize_mapping():
# No uninitialized defaultdicts
with pytest.raises(TypeError):
msg = r"to_dict\(\) only accepts initialized defaultdicts"
with pytest.raises(TypeError, match=msg):
com.standardize_mapping(collections.defaultdict)

# No non-mapping subtypes, instance
with pytest.raises(TypeError):
msg = "unsupported type: <class 'list'>"
with pytest.raises(TypeError, match=msg):
com.standardize_mapping([])

# No non-mapping subtypes, class
with pytest.raises(TypeError):
with pytest.raises(TypeError, match=msg):
com.standardize_mapping(list)

fill = {"bad": "data"}
Expand Down
7 changes: 6 additions & 1 deletion pandas/tests/test_downstream.py
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,12 @@ def test_missing_required_dependency():
# https://github.com/MacPython/pandas-wheels/pull/50
call = ["python", "-sSE", "-c", "import pandas"]

with pytest.raises(subprocess.CalledProcessError) as exc:
msg = (
r"Command '\['python', '-sSE', '-c', 'import pandas'\]' "
"returned non-zero exit status 1."
)

with pytest.raises(subprocess.CalledProcessError, match=msg) as exc:
subprocess.check_output(call, stderr=subprocess.STDOUT)

output = exc.value.stdout.decode()
Expand Down
11 changes: 7 additions & 4 deletions pandas/tests/test_errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,15 @@
def test_exception_importable(exc):
from pandas import errors

e = getattr(errors, exc)
assert e is not None
err = getattr(errors, exc)
assert err is not None

# check that we can raise on them
with pytest.raises(e):
raise e()

msg = "^$"

with pytest.raises(err, match=msg):
raise err()


def test_catch_oob():
Expand Down
13 changes: 8 additions & 5 deletions pandas/tests/test_lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ def test_max_len_string_array(self):
assert libwriters.max_len_string_array(arr) == 3

# raises
with pytest.raises(TypeError):
msg = "No matching signature found"
with pytest.raises(TypeError, match=msg):
libwriters.max_len_string_array(arr.astype("U"))

def test_fast_unique_multiple_list_gen_sort(self):
Expand Down Expand Up @@ -100,9 +101,11 @@ def test_maybe_indices_to_slice_right_edge(self):
assert not isinstance(maybe_slice, slice)
tm.assert_numpy_array_equal(maybe_slice, indices)

with pytest.raises(IndexError):
msg = "index 100 is out of bounds for axis (0|1) with size 100"

with pytest.raises(IndexError, match=msg):
target[indices]
with pytest.raises(IndexError):
with pytest.raises(IndexError, match=msg):
target[maybe_slice]

indices = np.array([100, 99, 98, 97], dtype=np.int64)
Expand All @@ -111,9 +114,9 @@ def test_maybe_indices_to_slice_right_edge(self):
assert not isinstance(maybe_slice, slice)
tm.assert_numpy_array_equal(maybe_slice, indices)

with pytest.raises(IndexError):
with pytest.raises(IndexError, match=msg):
target[indices]
with pytest.raises(IndexError):
with pytest.raises(IndexError, match=msg):
target[maybe_slice]

for case in [[99, 97, 99, 96], [99, 99, 98, 97], [98, 98, 97, 96]]:
Expand Down
17 changes: 13 additions & 4 deletions pandas/tests/test_take.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,16 +423,21 @@ class TestExtensionTake:

def test_bounds_check_large(self):
arr = np.array([1, 2])
with pytest.raises(IndexError):

msg = "indices are out-of-bounds"
with pytest.raises(IndexError, match=msg):
algos.take(arr, [2, 3], allow_fill=True)

with pytest.raises(IndexError):
msg = "index 2 is out of bounds for size 2"
with pytest.raises(IndexError, match=msg):
algos.take(arr, [2, 3], allow_fill=False)

def test_bounds_check_small(self):
arr = np.array([1, 2, 3], dtype=np.int64)
indexer = [0, -1, -2]
with pytest.raises(ValueError):

msg = r"'indices' contains values less than allowed \(-2 < -1\)"
with pytest.raises(ValueError, match=msg):
algos.take(arr, indexer, allow_fill=True)

result = algos.take(arr, indexer)
Expand All @@ -446,7 +451,11 @@ def test_take_empty(self, allow_fill):
result = algos.take(arr, [], allow_fill=allow_fill)
tm.assert_numpy_array_equal(arr, result)

with pytest.raises(IndexError):
msg = (
r"cannot do a non-empty take from an empty axes.|"
"indices are out-of-bounds"
)
with pytest.raises(IndexError, match=msg):
algos.take(arr, [0], allow_fill=allow_fill)

def test_take_na_empty(self):
Expand Down