From: Ezio Melotti Date: Fri, 10 Dec 2010 02:32:05 +0000 (+0000) Subject: #10273: Remove a "Matches" that I missed in r86910. Thanks to RDM for noticing it. X-Git-Tag: v3.2b2~158 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8f77630747346842979d21a144d2a28963db91da;p=python #10273: Remove a "Matches" that I missed in r86910. Thanks to RDM for noticing it. --- diff --git a/Lib/unittest/case.py b/Lib/unittest/case.py index 227879cb6d..0ad78571b2 100644 --- a/Lib/unittest/case.py +++ b/Lib/unittest/case.py @@ -1127,7 +1127,7 @@ class TestCase(object): msg = '%s: %r not found in %r' % (msg, expected_regex.pattern, text) raise self.failureException(msg) - def assertNotRegexMatches(self, text, unexpected_regex, msg=None): + def assertNotRegex(self, text, unexpected_regex, msg=None): """Fail the test if the text matches the regular expression.""" if isinstance(unexpected_regex, (str, bytes)): unexpected_regex = re.compile(unexpected_regex) diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py index 69572eee19..df2e89ead2 100644 --- a/Lib/unittest/test/test_assertions.py +++ b/Lib/unittest/test/test_assertions.py @@ -92,15 +92,15 @@ class Test_Assertions(unittest.TestCase): else: self.fail("assertRaises() didn't let exception pass through") - def testAssertNotRegexMatches(self): - self.assertNotRegexMatches('Ala ma kota', r'r+') + def testAssertNotRegex(self): + self.assertNotRegex('Ala ma kota', r'r+') try: - self.assertNotRegexMatches('Ala ma kota', r'k.t', 'Message') + self.assertNotRegex('Ala ma kota', r'k.t', 'Message') except self.failureException as e: self.assertIn("'kot'", e.args[0]) self.assertIn('Message', e.args[0]) else: - self.fail('assertNotRegexMatches should have failed.') + self.fail('assertNotRegex should have failed.') class TestLongMessage(unittest.TestCase):