jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1417 from hackebrot/fix-docs-on-traceback-styles 

Fix docs on traceback styles
This commit is contained in:
Bruno Oliveira 2016-02-27 18:28:57 -03:00
parent b64aaac7ec ab90043adc
commit 4194ddd5b4
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.rst
View File

@ -94,7 +94,9 @@
* Fix formatting utf-8 explanation messages (`#1379`_). * Fix formatting utf-8 explanation messages (`#1379`_).
Thanks `@biern`_ for the PR. Thanks `@biern`_ for the PR.
* * Fix `traceback style docs`_ to describe all of the available options
(auto/long/short/line/native/no), with `auto` being the default since v2.6.
Thanks `@hackebrot`_ for the PR.
* *
@ -102,6 +104,8 @@
* *
.. _`traceback style docs`: https://pytest.org/latest/usage.html#modifying-python-traceback-printing
.. _#1379: https://github.com/pytest-dev/pytest/issues/1379 .. _#1379: https://github.com/pytest-dev/pytest/issues/1379
.. _#1366: https://github.com/pytest-dev/pytest/issues/1366 .. _#1366: https://github.com/pytest-dev/pytest/issues/1366
.. _#1040: https://github.com/pytest-dev/pytest/pull/1040 .. _#1040: https://github.com/pytest-dev/pytest/pull/1040
@ -124,6 +128,7 @@
.. _@tomviner: https://github.com/tomviner .. _@tomviner: https://github.com/tomviner
.. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt .. _@RonnyPfannschmidt: https://github.com/RonnyPfannschmidt
.. _@rabbbit: https://github.com/rabbbit .. _@rabbbit: https://github.com/rabbbit
.. _@hackebrot: https://github.com/hackebrot
2.8.7 2.8.7
----- -----

9
doc/en/usage.rst
View File

@ -66,10 +66,13 @@ Examples for modifying traceback printing::
py.test --showlocals # show local variables in tracebacks py.test --showlocals # show local variables in tracebacks
py.test -l # show local variables (shortcut) py.test -l # show local variables (shortcut)
py.test --tb=long # the default informative traceback formatting py.test --tb=auto # (default) 'long' tracebacks for the first and last
py.test --tb=native # the Python standard library formatting # entry, but 'short' style for the other entries
py.test --tb=short # a shorter traceback format py.test --tb=long # exhaustive, informative traceback formatting
py.test --tb=short # shorter traceback format
py.test --tb=line # only one line per failure py.test --tb=line # only one line per failure
py.test --tb=native # Python standard library formatting
py.test --tb=no # no traceback at all
Dropping to PDB_ (Python Debugger) on failures Dropping to PDB_ (Python Debugger) on failures
----------------------------------------------- -----------------------------------------------