diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-28 00:25:02 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2010-03-28 00:25:02 (GMT) |
| commit | fd1b0930ce6a84096d30c03a70cd9e0ee4a3178f (patch) | |
| tree | 349bba5ec56f76a0fc2b5d04fbcb9d7945241413 /Lib/unittest/test/test_result.py | |
| parent | c049d870b58107945d8e9784df1fdfbd4e9fa6be (diff) | |
| download | cpython-fd1b0930ce6a84096d30c03a70cd9e0ee4a3178f.zip cpython-fd1b0930ce6a84096d30c03a70cd9e0ee4a3178f.tar.gz cpython-fd1b0930ce6a84096d30c03a70cd9e0ee4a3178f.tar.bz2 | |
Merged revisions 79297,79310,79382,79425-79427,79450 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79297 | florent.xicluna | 2010-03-22 18:18:18 +0100 (lun, 22 mar 2010) | 2 lines
#7668: Fix test_httpservers failure when sys.executable contains non-ASCII bytes.
........
r79310 | florent.xicluna | 2010-03-22 23:52:11 +0100 (lun, 22 mar 2010) | 2 lines
Issue #8205: Remove the "Modules" directory from sys.path when Python is running from the build directory (POSIX only).
........
r79382 | florent.xicluna | 2010-03-24 20:33:25 +0100 (mer, 24 mar 2010) | 2 lines
Skip tests which depend on multiprocessing.sharedctypes, if _ctypes is not available.
........
r79425 | florent.xicluna | 2010-03-25 21:32:07 +0100 (jeu, 25 mar 2010) | 2 lines
Syntax cleanup `== None` -> `is None`
........
r79426 | florent.xicluna | 2010-03-25 21:33:49 +0100 (jeu, 25 mar 2010) | 2 lines
#8207: Fix test_pep277 on OS X
........
r79427 | florent.xicluna | 2010-03-25 21:39:10 +0100 (jeu, 25 mar 2010) | 2 lines
Fix test_unittest and test_warnings when running "python -Werror -m test.regrtest"
........
r79450 | florent.xicluna | 2010-03-26 20:32:44 +0100 (ven, 26 mar 2010) | 2 lines
Ensure that the failed or unexpected tests are sorted before printing.
........
Diffstat (limited to 'Lib/unittest/test/test_result.py')
| -rw-r--r-- | Lib/unittest/test/test_result.py | 5 |
1 files changed, 2 insertions, 3 deletions
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): |