|
 |
afe0d5 |
From 541e6184fca60a01ff7e8c1bba794c083ac4245f Mon Sep 17 00:00:00 2001
|
|
|
afe0d5 |
From: =?UTF-8?q?Jan=20Pokorn=C3=BD?= <jpokorny@redhat.com>
|
|
|
afe0d5 |
Date: Tue, 10 Jul 2018 19:25:34 +0200
|
|
|
afe0d5 |
Subject: [PATCH] test: drop underqualified identifier in unittest's 2.6 compat
|
|
|
afe0d5 |
"polyfill"
|
|
|
afe0d5 |
MIME-Version: 1.0
|
|
|
afe0d5 |
Content-Type: text/plain; charset=UTF-8
|
|
|
afe0d5 |
Content-Transfer-Encoding: 8bit
|
|
|
afe0d5 |
|
|
|
afe0d5 |
Specifically, in supplemented unittest.TestCase.assertRegexpMatches
|
|
|
afe0d5 |
method. In Python 2.7's implementation, there's no re.MULTILINE
|
|
|
afe0d5 |
modifier at that very place, either.
|
|
|
afe0d5 |
|
|
|
afe0d5 |
Not sure what the original purpose of introducing that with c1c47f5 was.
|
|
|
afe0d5 |
|
|
|
afe0d5 |
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
|
|
|
afe0d5 |
---
|
|
|
afe0d5 |
test/assertions.py | 2 +-
|
|
|
afe0d5 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
afe0d5 |
|
|
|
afe0d5 |
diff --git a/test/assertions.py b/test/assertions.py
|
|
|
afe0d5 |
index 34333ca..fafb291 100644
|
|
|
afe0d5 |
--- a/test/assertions.py
|
|
|
afe0d5 |
+++ b/test/assertions.py
|
|
|
afe0d5 |
@@ -23,7 +23,7 @@ class BoothAssertions:
|
|
|
afe0d5 |
"""Fail the test unless the text matches the regular expression."""
|
|
|
afe0d5 |
if isinstance(expected_regexp, str):
|
|
|
afe0d5 |
expected_regexp = re.compile(expected_regexp)
|
|
|
afe0d5 |
- if not expected_regexp.search(text, MULTILINE):
|
|
|
afe0d5 |
+ if not expected_regexp.search(text):
|
|
|
afe0d5 |
msg = msg or "Regexp didn't match"
|
|
|
afe0d5 |
msg = '%s: %r not found in %r' % (msg, expected_regexp.pattern, text)
|
|
|
afe0d5 |
raise self.failureException(msg)
|
|
|
afe0d5 |
--
|
|
|
afe0d5 |
2.18.0.rc2
|
|
|
afe0d5 |
|