summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorR David Murray <rdmurray@bitdance.com>2014-01-03 18:03:36 (GMT)
committerR David Murray <rdmurray@bitdance.com>2014-01-03 18:03:36 (GMT)
commit42fa110035032f252c7691b0129717b2eab32731 (patch)
treec6eb9ff37c45de3de8ccbd0d053326bc8134c9a1 /Doc
parenta475a8d313805bb84affcba8da7c8e82319d0761 (diff)
downloadcpython-42fa110035032f252c7691b0129717b2eab32731.zip
cpython-42fa110035032f252c7691b0129717b2eab32731.tar.gz
cpython-42fa110035032f252c7691b0129717b2eab32731.tar.bz2
whatsnew: unittest import time SkipTest reported as skip not error.
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/unittest.rst5
-rw-r--r--Doc/whatsnew/3.4.rst4
2 files changed, 7 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 3f30127..5cbc51b 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -559,8 +559,9 @@ The following decorators implement test skipping and expected failures:
Usually you can use :meth:`TestCase.skipTest` or one of the skipping
decorators instead of raising this directly.
-Skipped tests will not have :meth:`setUp` or :meth:`tearDown` run around them.
-Skipped classes will not have :meth:`setUpClass` or :meth:`tearDownClass` run.
+Skipped tests will not have :meth:`~TestCase.setUp` or :meth:`~TestCase.tearDown` run around them.
+Skipped classes will not have :meth:`~TestCase.setUpClass` or :meth:`~TestCase.tearDownClass` run.
+Skipped modules will not have :func:`setUpModule` or :func:`tearDownModule` run.
.. _subtests:
diff --git a/Doc/whatsnew/3.4.rst b/Doc/whatsnew/3.4.rst
index 6681eba..31208c1 100644
--- a/Doc/whatsnew/3.4.rst
+++ b/Doc/whatsnew/3.4.rst
@@ -1015,6 +1015,10 @@ Support for easy dynamically-generated subtests using the
*defaultTest*, where previously it only accepted a single test name as a
string. (Contributed by Jyrki Pulliainen in :issue:`15132`.)
+If :class:`~unittest.SkipTest` is raised during test discovery (that is, at the
+module level in the test file), it is now reported as a skip instead of an
+error. (Contributed by Zach Ware in :issue:`16935`.)
+
venv
----