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

Simplified Fix for Repr #7123

Closed
wants to merge 8 commits into from
Closed

Simplified Fix for Repr #7123

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
c5a5221
Simplified Tolerance Display for Small Values
koscinskic Apr 1, 2020
e308940
Changed Condition for Simplified Tolerance
koscinskic Apr 14, 2020
330b746
Inverted Incorrect Tolerance Condition
koscinskic Apr 15, 2020
6bb8c76
Changed Relative Tolerance to Display as Percentage
koscinskic Apr 15, 2020
3b05a39
Corrected Tolerance Condition for isintance
koscinskic Apr 15, 2020
5af7b2b
Refined Simplified Tolerance Conditions for both abs and rel
koscinskic Apr 15, 2020
4ea6100
Removed e Condition for Simplified rel Tolerance
koscinskic Apr 15, 2020
7e065f3
Removed Commented Code from approx
koscinskic Apr 15, 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
7 changes: 6 additions & 1 deletion src/_pytest/python_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,12 @@ def __repr__(self):
# If a sensible tolerance can't be calculated, self.tolerance will
# raise a ValueError. In this case, display '???'.
try:
vetted_tolerance = "{:.1e}".format(self.tolerance)
if isinstance(self.tolerance, int):
vetted_tolerance = "{:n}".format(self.tolerance)
elif self.rel is not None and not math.isinf(self.tolerance):
vetted_tolerance = "{:.1%}".format(self.tolerance / self.expected)
else:
vetted_tolerance = "{:.1e}".format(self.tolerance)
if isinstance(self.expected, complex) and not math.isinf(self.tolerance):
vetted_tolerance += " ∠ ±180°"
except ValueError:
Expand Down