Merged revisions 70656,70668-70669,70671,70701,70703,70706 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70656 | georg.brandl | 2009-03-28 14:33:33 -0500 (Sat, 28 Mar 2009) | 2 lines
Add a script to fixup rst files if the pre-commit hook rejects them.
........
r70668 | benjamin.peterson | 2009-03-28 22:16:57 -0500 (Sat, 28 Mar 2009) | 1 line
a more realistic example
........
r70669 | benjamin.peterson | 2009-03-28 22:31:40 -0500 (Sat, 28 Mar 2009) | 1 line
stop the versionchanged directive from hiding the docs
........
r70671 | benjamin.peterson | 2009-03-28 22:39:58 -0500 (Sat, 28 Mar 2009) | 1 line
fix consistency
........
r70701 | benjamin.peterson | 2009-03-29 17:27:26 -0500 (Sun, 29 Mar 2009) | 1 line
add missing import
........
r70703 | benjamin.peterson | 2009-03-29 21:14:21 -0500 (Sun, 29 Mar 2009) | 1 line
fix import
........
r70706 | benjamin.peterson | 2009-03-30 09:42:23 -0500 (Mon, 30 Mar 2009) | 1 line
add missing import
........
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 3a1e63a..c9dc6b6 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -446,12 +446,26 @@
def test_nothing(self):
self.fail("shouldn't happen")
+ @unittest.skipIf(mylib.__version__ < (1, 3), "not supported in this library version")
+ def test_format(self):
+ # Tests that work for only a certain version of the library.
+ pass
+
+ @unittest.skipUnless(sys.platform.startswith("win"), "requires Windows")
+ def test_windows_support(self):
+ # windows specific testing code
+ pass
+
This is the output of running the example above in verbose mode: ::
+ test_format (__main__.MyTestCase) ... skipped 'not supported in this library version'
test_nothing (__main__.MyTestCase) ... skipped 'demonstrating skipping'
+ test_windows_support (__main__.MyTestCase) ... skipped 'requires Windows'
----------------------------------------------------------------------
- Ran 1 test in 0.072s
+ Ran 3 tests in 0.005s
+
+ OK (skipped=3)
Classes can be skipped just like methods: ::
@@ -657,13 +671,15 @@
To catch any of a group of exceptions, a tuple containing the exception
classes may be passed as *exception*.
+ If *callable* is omitted or None, returns a context manager so that the
+ code under test can be written inline rather than as a function::
+
+ with self.failUnlessRaises(some_error_class):
+ do_something()
+
.. versionchanged:: 3.1
+ Added the ability to use :meth:`assertRaises` as a context manager.
- If *callable* is omitted or None, returns a context manager so that the
- code under test can be written inline rather than as a function::
-
- with self.failUnlessRaises(some_error_class):
- do_something()
.. method:: failIf(expr[, msg])
assertFalse(expr[, msg])