diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2016-08-30 05:23:37 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2016-08-30 05:23:37 (GMT) |
| commit | 003359370bf434baa4437d882bee953f78220ef5 (patch) | |
| tree | 30583a1a9c8992f7b1174bb83a20c1e6d2efc2a8 /Doc/library/unittest.rst | |
| parent | ee8e17f901bcb2f94032b82b61ad8b98b6528616 (diff) | |
| parent | f0a71cf4242b15dc85fbb7681c72bf4cf41ef181 (diff) | |
| download | cpython-003359370bf434baa4437d882bee953f78220ef5.zip cpython-003359370bf434baa4437d882bee953f78220ef5.tar.gz cpython-003359370bf434baa4437d882bee953f78220ef5.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'Doc/library/unittest.rst')
| -rw-r--r-- | Doc/library/unittest.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst index 9f7fc57..dd188b0 100644 --- a/Doc/library/unittest.rst +++ b/Doc/library/unittest.rst @@ -2053,7 +2053,7 @@ Loading and running tests The *failfast*, *catchbreak* and *buffer* parameters have the same effect as the same-name `command-line options`_. - The *warning* argument specifies the :ref:`warning filter <warning-filter>` + 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`, otherwise it will be set to ``'default'``. |