diff options
| author | Martin Panter <vadmium+py@gmail.com> | 2016-10-30 04:21:23 (GMT) |
|---|---|---|
| committer | Martin Panter <vadmium+py@gmail.com> | 2016-10-30 04:21:23 (GMT) |
| commit | 944078786797b03b415d76b0b2d7f3fb8570b9a4 (patch) | |
| tree | 452bee864a07539ea284c04daed949d66821eb7d /Doc/library/unittest.rst | |
| parent | 77d574d4aeae4b7b9b976a68b367783a0932b6c8 (diff) | |
| parent | b8c5f54248369ff89575c1416a98e13e718a4aa4 (diff) | |
| download | cpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.zip cpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.tar.gz cpython-944078786797b03b415d76b0b2d7f3fb8570b9a4.tar.bz2 | |
Issue #26638: Merge option warning fixes from 3.5 into 3.6
Diffstat (limited to 'Doc/library/unittest.rst')
| -rw-r--r-- | Doc/library/unittest.rst | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 1b0d7a7..c13a731 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -1972,7 +1972,8 @@ Loading and running tests 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 + be overridden using Python's :option:`!-Wd` or :option:`!-Wa` options + (see :ref:`Warning control <using-on-warnings>`) and leaving *warnings* to ``None``. .. versionchanged:: 3.2 @@ -2053,7 +2054,8 @@ Loading and running tests The *warnings* argument specifies the :ref:`warning filter <warning-filter>` that should be used while running the tests. If it's not specified, it will - remain ``None`` if a :option:`-W` option is passed to :program:`python`, + remain ``None`` if a :option:`!-W` option is passed to :program:`python` + (see :ref:`Warning control <using-on-warnings>`), otherwise it will be set to ``'default'``. Calling ``main`` actually returns an instance of the ``TestProgram`` class. |