From 5dbbabd46312e06e6c92f4ee6d23279bae993ea8 Mon Sep 17 00:00:00 2001 From: Thomas Grainger Date: Mon, 24 Jun 2019 11:23:08 +0100 Subject: [PATCH] special case text_type matches Fixes #5478 --- src/_pytest/_code/code.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/_pytest/_code/code.py b/src/_pytest/_code/code.py index 8c73ccc6adc..1b6a765d0cd 100644 --- a/src/_pytest/_code/code.py +++ b/src/_pytest/_code/code.py @@ -572,6 +572,11 @@ def match(self, regexp): raised. """ __tracebackhide__ = True + if isinstance(regexp, text_type): + if not re.search(regexp, text_type(self.value)): + assert 0, u"Pattern '{!s}' not found in '{!s}'".format(regexp, self.value) + return True + if not re.search(regexp, str(self.value)): assert 0, "Pattern '{!s}' not found in '{!s}'".format(regexp, self.value) return True