[Python-checkins] r70616 - in python/trunk: Doc/library/unittest.rst Lib/test/test_unittest.py Lib/unittest.py

benjamin.peterson python-checkins at python.org
Thu Mar 26 21:05:50 CET 2009


Author: benjamin.peterson
Date: Thu Mar 26 21:05:50 2009
New Revision: 70616

Log:
rename TestCase.skip() to skipTest() because it causes annoying problems with trial #5571

Modified:
   python/trunk/Doc/library/unittest.rst
   python/trunk/Lib/test/test_unittest.py
   python/trunk/Lib/unittest.py

Modified: python/trunk/Doc/library/unittest.rst
==============================================================================
--- python/trunk/Doc/library/unittest.rst	(original)
+++ python/trunk/Doc/library/unittest.rst	Thu Mar 26 21:05:50 2009
@@ -576,7 +576,7 @@
       instance.
 
 
-   .. method:: skip(reason)
+   .. method:: skipTest(reason)
 
       Calling this during the a test method or :meth:`setUp` skips the current
       test.  See :ref:`unittest-skipping` for more information.

Modified: python/trunk/Lib/test/test_unittest.py
==============================================================================
--- python/trunk/Lib/test/test_unittest.py	(original)
+++ python/trunk/Lib/test/test_unittest.py	Thu Mar 26 21:05:50 2009
@@ -2294,7 +2294,7 @@
     def test_skipping(self):
         class Foo(unittest.TestCase):
             def test_skip_me(self):
-                self.skip("skip")
+                self.skipTest("skip")
         events = []
         result = LoggingResult(events)
         test = Foo("test_skip_me")
@@ -2305,7 +2305,7 @@
         # Try letting setUp skip the test now.
         class Foo(unittest.TestCase):
             def setUp(self):
-                self.skip("testing")
+                self.skipTest("testing")
             def test_nothing(self): pass
         events = []
         result = LoggingResult(events)

Modified: python/trunk/Lib/unittest.py
==============================================================================
--- python/trunk/Lib/unittest.py	(original)
+++ python/trunk/Lib/unittest.py	Thu Mar 26 21:05:50 2009
@@ -411,7 +411,7 @@
         getattr(self, self._testMethodName)()
         self.tearDown()
 
-    def skip(self, reason):
+    def skipTest(self, reason):
         """Skip this test."""
         raise SkipTest(reason)
 


More information about the Python-checkins mailing list