jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #8453 from encukou/rel-error-message 

Fix value in error message about negative relative tolerance
This commit is contained in:
Kale Kundert 2021-03-16 16:43:31 -04:00 committed by GitHub
parent 2ce446a75f da4abd1c82
commit dd3709718d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/_pytest/python_api.py
View File

@ -319,7 +319,7 @@ class ApproxScalar(ApproxBase):
if relative_tolerance < 0: if relative_tolerance < 0:
raise ValueError( raise ValueError(
f"relative tolerance can't be negative: {absolute_tolerance}" f"relative tolerance can't be negative: {relative_tolerance}"
) )
if math.isnan(relative_tolerance): if math.isnan(relative_tolerance):
raise ValueError("relative tolerance can't be NaN.") raise ValueError("relative tolerance can't be NaN.")

7
testing/python/approx.py
View File

@ -141,6 +141,13 @@ class TestApprox:
with pytest.raises(ValueError): with pytest.raises(ValueError):
1.1 == approx(1, rel, abs) 1.1 == approx(1, rel, abs)
def test_negative_tolerance_message(self):
# Error message for negative tolerance should include the value.
with pytest.raises(ValueError, match="-3"):
0 == approx(1, abs=-3)
with pytest.raises(ValueError, match="-3"):
0 == approx(1, rel=-3)
def test_inf_tolerance(self): def test_inf_tolerance(self):
# Everything should be equal if the tolerance is infinite. # Everything should be equal if the tolerance is infinite.
large_diffs = [(1, 1000), (1e-50, 1e50), (-1.0, -1e300), (0.0, 10)] large_diffs = [(1, 1000), (1e-50, 1e50), (-1.0, -1e300), (0.0, 10)]