use safe_str to serialize Exceptions Fixes pytest-dev#5478

graingert · Jun 25, 2019 · fee0138 · fee0138
1 parent 4b104ba
commit fee0138
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py
@@ -572,8 +572,9 @@ def match(self, regexp):
         raised.
         """
         __tracebackhide__ = True
-        if not re.search(regexp, str(self.value)):
-            assert 0, "Pattern '{!s}' not found in '{!s}'".format(regexp, self.value)
+        value = safe_str(self.value)
+        if not re.search(regexp, value):
+            assert 0, "Pattern {!r} not found in {!r}".format(regexp, value)
         return True
 
 

diff --git a/testing/python/raises.py b/testing/python/raises.py
@@ -278,3 +278,7 @@ def __class__(self):
                 with pytest.raises(CrappyClass()):
                     pass
             assert "via __class__" in excinfo.value.args[0]
+
+    def test_u(self):
+        with pytest.raises(AssertionError, match=u"\u2603"):
+            assert False, u"\u2603"