diff options
Diffstat (limited to 'Lib/unittest/test')
| -rw-r--r-- | Lib/unittest/test/test_assertions.py | 10 | ||||
| -rw-r--r-- | Lib/unittest/test/test_case.py | 20 | ||||
| -rw-r--r-- | Lib/unittest/test/test_result.py | 5 |
3 files changed, 13 insertions, 22 deletions
diff --git a/Lib/unittest/test/test_assertions.py b/Lib/unittest/test/test_assertions.py index 68a723a..fe65849 100644 --- a/Lib/unittest/test/test_assertions.py +++ b/Lib/unittest/test/test_assertions.py @@ -1,7 +1,5 @@ import unittest -import warnings - class Test_Assertions(unittest.TestCase): def test_AlmostEqual(self): @@ -108,11 +106,9 @@ class TestLongMessage(unittest.TestCase): self.testableTrue._formatMessage(object(), 'foo') def test_formatMessage_unicode_error(self): - with warnings.catch_warnings(record=True): - # This causes a UnicodeWarning due to its craziness - one = ''.join(chr(i) for i in range(255)) - # this used to cause a UnicodeDecodeError constructing msg - self.testableTrue._formatMessage(one, '\uFFFD') + one = ''.join(chr(i) for i in range(255)) + # this used to cause a UnicodeDecodeError constructing msg + self.testableTrue._formatMessage(one, '\uFFFD') def assertMessages(self, methodName, args, errors): def getMethod(i): diff --git a/Lib/unittest/test/test_case.py b/Lib/unittest/test/test_case.py index c9f346f..08c4a7b 100644 --- a/Lib/unittest/test/test_case.py +++ b/Lib/unittest/test/test_case.py @@ -1,6 +1,5 @@ import re import sys -import warnings from copy import deepcopy from test import support @@ -496,12 +495,10 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing): with self.assertRaises(self.failureException): self.assertDictContainsSubset({'a': 1, 'c': 1}, {'a': 1}) - with warnings.catch_warnings(record=True): - # silence the UnicodeWarning - one = ''.join(chr(i) for i in range(255)) - # this used to cause a UnicodeDecodeError constructing the failure msg - with self.assertRaises(self.failureException): - self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'}) + one = ''.join(chr(i) for i in range(255)) + # this used to cause a UnicodeDecodeError constructing the failure msg + with self.assertRaises(self.failureException): + self.assertDictContainsSubset({'foo': one}, {'foo': '\uFFFD'}) def testAssertEqual(self): equal_pairs = [ @@ -615,9 +612,9 @@ class Test_TestCase(unittest.TestCase, TestEquality, TestHashing): # hashable types, but not orderable self.assertRaises(self.failureException, self.assertItemsEqual, [], [divmod, 'x', 1, 5j, 2j, frozenset()]) - # comparing dicts raises a py3k warning + # comparing dicts self.assertItemsEqual([{'a': 1}, {'b': 2}], [{'b': 2}, {'a': 1}]) - # comparing heterogenous non-hashable sequences raises a py3k warning + # comparing heterogenous non-hashable sequences self.assertItemsEqual([1, 'x', divmod, []], [divmod, [], 'x', 1]) self.assertRaises(self.failureException, self.assertItemsEqual, [], [divmod, [], 'x', 1, 5j, 2j, set()]) @@ -852,10 +849,9 @@ test case (self.assertSameElements, ([1, 1, 2, 3], [1, 2, 3])) ) for meth, args in old: - with warnings.catch_warnings(record=True) as w: + with support.check_warnings(('', DeprecationWarning)) as w: meth(*args) - self.assertEqual(len(w), 1) - self.assertIs(w[0].category, DeprecationWarning) + self.assertEqual(len(w.warnings), 1) def testDeepcopy(self): # Issue: 5660 diff --git a/Lib/unittest/test/test_result.py b/Lib/unittest/test/test_result.py index 9002466..967b662 100644 --- a/Lib/unittest/test/test_result.py +++ b/Lib/unittest/test/test_result.py @@ -308,12 +308,11 @@ OldResult = type('OldResult', (object,), classDict) class Test_OldTestResult(unittest.TestCase): def assertOldResultWarning(self, test, failures): - with warnings.catch_warnings(record=True) as log: + with support.check_warnings(("TestResult has no add.+ method,", + RuntimeWarning)): result = OldResult() test.run(result) self.assertEqual(len(result.failures), failures) - warning, = log - self.assertIs(warning.category, RuntimeWarning) def testOldTestResult(self): class Test(unittest.TestCase): |