Skip to content

Commit

Permalink
Merge pull request #11308 from reaganjlee/iter-reporting
Browse files Browse the repository at this point in the history
Improve reporting from __iter__ exceptions
  • Loading branch information
Zac-HD committed Aug 21, 2023
2 parents 4deb38b + d1722d5 commit 050f402
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions changelog/7966.bugfix.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Removes unhelpful error message from assertion rewrite mechanism when exceptions raised in __iter__ methods, and instead treats them as un-iterable.
2 changes: 1 addition & 1 deletion src/_pytest/assertion/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ def isiterable(obj: Any) -> bool:
try:
iter(obj)
return not istext(obj)
except TypeError:
except Exception:
return False


Expand Down
19 changes: 19 additions & 0 deletions testing/test_assertrewrite.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,6 +685,25 @@ def myany(x) -> bool:
assert msg is not None
assert "<MY42 object> < 0" in msg

def test_assert_handling_raise_in__iter__(self, pytester: Pytester) -> None:
pytester.makepyfile(
"""\
class A:
def __iter__(self):
raise ValueError()
def __eq__(self, o: object) -> bool:
return self is o
def __repr__(self):
return "<A object>"
assert A() == A()
"""
)
result = pytester.runpytest()
result.stdout.fnmatch_lines(["*E*assert <A object> == <A object>"])

def test_formatchar(self) -> None:
def f() -> None:
assert "%test" == "test" # type: ignore[comparison-overlap]
Expand Down

0 comments on commit 050f402

Please sign in to comment.