From 52baa290335139e2c94fc43e234f920ab181e22f Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Tue, 24 Mar 2009 00:56:30 +0000 Subject: 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__ ........ --- Lib/test/test_unittest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Lib/test/test_unittest.py') diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index 74aff148ec..9b8b00bcb7 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()) -- cgit v1.2.1