diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-03-24 00:56:30 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-03-24 00:56:30 (GMT) |
| commit | 52baa290335139e2c94fc43e234f920ab181e22f (patch) | |
| tree | a157f52722381fef43230be6aed4450ec8e4e732 /Lib/test/test_unittest.py | |
| parent | 6b232cdc7f652b34b5809d18cb9106578d840da8 (diff) | |
| download | cpython-52baa290335139e2c94fc43e234f920ab181e22f.zip cpython-52baa290335139e2c94fc43e234f920ab181e22f.tar.gz cpython-52baa290335139e2c94fc43e234f920ab181e22f.tar.bz2 | |
Merged revisions 70558,70561-70563,70568-70571 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70558 | benjamin.peterson | 2009-03-23 17:29:45 -0500 (Mon, 23 Mar 2009) | 4 lines
comply with the evilJavaNamingScheme for attribute names
It seems my love of PEP 8 overrode the need for consistentcy
........
r70561 | benjamin.peterson | 2009-03-23 18:10:14 -0500 (Mon, 23 Mar 2009) | 1 line
refactor unittest docs
........
r70562 | benjamin.peterson | 2009-03-23 18:13:36 -0500 (Mon, 23 Mar 2009) | 1 line
forgot to document that setUp can be skipped (silly me...)
........
r70563 | benjamin.peterson | 2009-03-23 18:19:03 -0500 (Mon, 23 Mar 2009) | 1 line
update from CVS
........
r70568 | benjamin.peterson | 2009-03-23 19:35:20 -0500 (Mon, 23 Mar 2009) | 1 line
some cleanup and modernization
........
r70569 | benjamin.peterson | 2009-03-23 19:36:16 -0500 (Mon, 23 Mar 2009) | 1 line
remove special metadata
........
r70570 | benjamin.peterson | 2009-03-23 19:37:12 -0500 (Mon, 23 Mar 2009) | 1 line
update docstring
........
r70571 | benjamin.peterson | 2009-03-23 19:39:24 -0500 (Mon, 23 Mar 2009) | 1 line
add new skipping things to __all__
........
Diffstat (limited to 'Lib/test/test_unittest.py')
| -rw-r--r-- | Lib/test/test_unittest.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 74aff14..9b8b00b 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -2372,7 +2372,7 @@ class Test_TestSkipping(TestCase): test.run(result) self.assertEqual(events, ['startTest', 'addExpectedFailure', 'stopTest']) - self.assertEqual(result.expected_failures[0][0], test) + self.assertEqual(result.expectedFailures[0][0], test) self.assertTrue(result.wasSuccessful()) def test_unexpected_success(self): @@ -2387,7 +2387,7 @@ class Test_TestSkipping(TestCase): self.assertEqual(events, ['startTest', 'addUnexpectedSuccess', 'stopTest']) self.assertFalse(result.failures) - self.assertEqual(result.unexpected_successes, [test]) + self.assertEqual(result.unexpectedSuccesses, [test]) self.assertTrue(result.wasSuccessful()) |