summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSenthil Kumaran <senthil@uthcode.com>2014-02-08 22:28:44 (GMT)
committerSenthil Kumaran <senthil@uthcode.com>2014-02-08 22:28:44 (GMT)
commit127242654de9837f4ee544fc3b0a5b22030613e0 (patch)
treeaa71a369a43820dfa5ea9bce01342c7605365425
parentc1567df61e27784cf3a4f6e0599a27caeb9a8296 (diff)
parent409ea5dac1bc9fb408b7ae27c57132dec5a7f9b6 (diff)
downloadcpython-127242654de9837f4ee544fc3b0a5b22030613e0.zip
cpython-127242654de9837f4ee544fc3b0a5b22030613e0.tar.gz
cpython-127242654de9837f4ee544fc3b0a5b22030613e0.tar.bz2
merge from 3.3
Include the mention of ResourceWarning being displayed by default by the test runner. Addressing #issue 20529
-rw-r--r--Doc/library/unittest.rst15
1 files changed, 8 insertions, 7 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
index 537cc3b..eea21d3 100644
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1916,13 +1916,14 @@ Loading and running tests
applications which run test suites should provide alternate implementations.
By default this runner shows :exc:`DeprecationWarning`,
- :exc:`PendingDeprecationWarning`, and :exc:`ImportWarning` even if they are
- :ref:`ignored by default <warning-ignored>`. Deprecation warnings caused by
- :ref:`deprecated unittest methods <deprecated-aliases>` are also
- special-cased and, when the warning filters are ``'default'`` or ``'always'``,
- they will appear only once per-module, in order to avoid too many warning
- messages. This behavior can be overridden using the :option:`-Wd` or
- :option:`-Wa` options and leaving *warnings* to ``None``.
+ :exc:`PendingDeprecationWarning`, :exc:`ResourceWarning` and
+ :exc:`ImportWarning` even if they are :ref:`ignored by default <warning-
+ ignored>`. Deprecation warnings caused by :ref:`deprecated unittest methods
+ <deprecated-aliases>` are also special-cased and, when the warning filters
+ are ``'default'`` or ``'always'``, they will appear only once per-module, in
+ order to avoid too many warning messages. This behavior can be overridden
+ using the :option:`-Wd` or :option:`-Wa` options and leaving *warnings* to
+ ``None``.
.. versionchanged:: 3.2
Added the ``warnings`` argument.