diff options
Diffstat (limited to 'Lib/unittest/test/test_assertions.py')
| -rw-r--r-- | Lib/unittest/test/test_assertions.py | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py index e1ba6147066..a1d20ebf2da 100644 --- a/Lib/unittest/test/test_assertions.py +++ b/Lib/unittest/test/test_assertions.py @@ -1,5 +1,5 @@ import datetime - +import warnings import unittest @@ -58,7 +58,7 @@ class Test_Assertions(unittest.TestCase): try: self.assertRaises(KeyError, lambda: None) except self.failureException as e: - self.assertIn("KeyError not raised", e.args) + self.assertIn("KeyError not raised", str(e)) else: self.fail("assertRaises() didn't fail") try: @@ -70,9 +70,10 @@ class Test_Assertions(unittest.TestCase): with self.assertRaises(KeyError) as cm: try: raise KeyError - except Exception, e: + except Exception as e: + exc = e raise - self.assertIs(cm.exception, e) + self.assertIs(cm.exception, exc) with self.assertRaises(KeyError): raise KeyError("key") @@ -80,7 +81,7 @@ class Test_Assertions(unittest.TestCase): with self.assertRaises(KeyError): pass except self.failureException as e: - self.assertIn("KeyError not raised", e.args) + self.assertIn("KeyError not raised", str(e)) else: self.fail("assertRaises() didn't fail") try: @@ -91,15 +92,15 @@ class Test_Assertions(unittest.TestCase): else: self.fail("assertRaises() didn't let exception pass through") - def testAssertNotRegexpMatches(self): - self.assertNotRegexpMatches('Ala ma kota', r'r+') + def testAssertNotRegex(self): + self.assertNotRegex('Ala ma kota', r'r+') try: - self.assertNotRegexpMatches('Ala ma kota', r'k.t', 'Message') - except self.failureException, e: + 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('assertNotRegexpMatches should have failed.') + self.fail('assertNotRegex should have failed.') class TestLongMessage(unittest.TestCase): @@ -126,7 +127,7 @@ class TestLongMessage(unittest.TestCase): self.testableFalse = TestableTestFalse('testTest') def testDefault(self): - self.assertFalse(unittest.TestCase.longMessage) + self.assertTrue(unittest.TestCase.longMessage) def test_formatMsg(self): self.assertEqual(self.testableFalse._formatMessage(None, "foo"), "foo") @@ -141,7 +142,7 @@ class TestLongMessage(unittest.TestCase): def test_formatMessage_unicode_error(self): one = ''.join(chr(i) for i in range(255)) # this used to cause a UnicodeDecodeError constructing msg - self.testableTrue._formatMessage(one, u'\uFFFD') + self.testableTrue._formatMessage(one, '\uFFFD') def assertMessages(self, methodName, args, errors): def getMethod(i): @@ -152,15 +153,15 @@ class TestLongMessage(unittest.TestCase): test = self.testableTrue return getattr(test, methodName) - for i, expected_regexp in enumerate(errors): + for i, expected_regex in enumerate(errors): testMethod = getMethod(i) kwargs = {} withMsg = i % 2 if withMsg: kwargs = {"msg": "oops"} - with self.assertRaisesRegexp(self.failureException, - expected_regexp=expected_regexp): + with self.assertRaisesRegex(self.failureException, + expected_regex=expected_regex): testMethod(*args, **kwargs) def testAssertTrue(self): @@ -223,10 +224,13 @@ class TestLongMessage(unittest.TestCase): "\+ \{'key': 'value'\} : oops$"]) def testAssertDictContainsSubset(self): - self.assertMessages('assertDictContainsSubset', ({'key': 'value'}, {}), - ["^Missing: 'key'$", "^oops$", - "^Missing: 'key'$", - "^Missing: 'key' : oops$"]) + with warnings.catch_warnings(): + warnings.simplefilter("ignore", DeprecationWarning) + + self.assertMessages('assertDictContainsSubset', ({'key': 'value'}, {}), + ["^Missing: 'key'$", "^oops$", + "^Missing: 'key'$", + "^Missing: 'key' : oops$"]) def testAssertMultiLineEqual(self): self.assertMessages('assertMultiLineEqual', ("", "foo"), @@ -280,7 +284,3 @@ class TestLongMessage(unittest.TestCase): ["^unexpectedly identical: None$", "^oops$", "^unexpectedly identical: None$", "^unexpectedly identical: None : oops$"]) - - -if __name__ == '__main__': - unittest.main() |