floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use unicode message if regex is also unicode in ExceptionInfo.match

This commit is contained in:
Bruno Oliveira 2019-06-30 10:34:40 -03:00
parent 86a4eb6008
commit 09dee292ca
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/_pytest/_code/code.py
View File

@ -572,9 +572,13 @@ class ExceptionInfo(object):
raised. raised.
""" """
__tracebackhide__ = True __tracebackhide__ = True
value = safe_str(self.value) value = (
text_type(self.value) if isinstance(regexp, text_type) else str(self.value)
)
if not re.search(regexp, value): if not re.search(regexp, value):
assert 0, "Pattern '{!s}' not found in '{!s}'".format(regexp, value) raise AssertionError(
"Pattern '{!s}' not found in '{!s}'".format(regexp, value)
)
return True return True

4
testing/python/raises.py
View File

@ -279,6 +279,8 @@ class TestRaises(object):
pass pass
assert "via __class__" in excinfo.value.args[0] assert "via __class__" in excinfo.value.args[0]
def test_u(self): def test_unicode_message(self):
"""pytest.raises should be able to match unicode messages when using a unicode regex (#5478)
"""
with pytest.raises(AssertionError, match=u"\u2603"): with pytest.raises(AssertionError, match=u"\u2603"):
assert False, u"\u2603" assert False, u"\u2603"