p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

check for user-generated exceptions

This commit is contained in:
Reagan Lee 2023-08-10 17:37:48 -07:00
parent 47c0fc3d78
commit e938580257
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/_pytest/assertion/util.py
View File

@ -132,8 +132,14 @@ def isiterable(obj: Any) -> bool:
try: try:
iter(obj) iter(obj)
return not istext(obj) return not istext(obj)
except TypeError: except Exception as e:
if (
isinstance(e, TypeError)
and (len(e.args) == 1)
and "iter() returned non-iterator of type" in str(e.args[0])
):
return False return False
raise ValueError(f"Unexpected exception {e!r} while testing object {obj!r}")
def has_default_eq( def has_default_eq(
@ -195,7 +201,14 @@ def assertrepr_compare(
explanation = _notin_text(left, right, verbose) explanation = _notin_text(left, right, verbose)
except outcomes.Exit: except outcomes.Exit:
raise raise
except Exception: except Exception as e:
if (
isinstance(e, ValueError)
and (len(e.args) == 1)
and ("Unexpected exception" in str(e.args[0]))
):
explanation = [e.args[0]]
else:
explanation = [ explanation = [
"(pytest_assertion plugin: representation of details failed: {}.".format( "(pytest_assertion plugin: representation of details failed: {}.".format(
_pytest._code.ExceptionInfo.from_current()._getreprcrash() _pytest._code.ExceptionInfo.from_current()._getreprcrash()