floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #5173 from blueyed/revert 

Revert "Merge pull request #4854 from blueyed/pdb-skip"
This commit is contained in:
Anthony Sottile 2019-04-26 17:48:04 -07:00 committed by GitHub
parent 76c6ed8b05 308b733b9d
commit ac7ee40aaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changelog/4854.feature.rst
View File

@ -1,5 +0,0 @@
The ``--pdb-skip`` option can now be used to ignore calls to
``pdb.set_trace()`` (and ``pytest.set_trace()``).
This is meant to help while debugging, where you want to use e.g. ``--pdb`` or
``--trace`` only, or just run the tests again without any interruption.

10
src/_pytest/debugging.py
View File

@ -46,13 +46,6 @@ def pytest_addoption(parser):
action="store_true", action="store_true",
help="Immediately break when running each test.", help="Immediately break when running each test.",
) )
group._addoption(
"--pdb-skip",
"--pdb-ignore-set_trace",
dest="pdb_ignore_set_trace",
action="store_true",
help="Ignore calls to pdb.set_trace().",
)
def _import_pdbcls(modname, classname): def _import_pdbcls(modname, classname):
@ -222,9 +215,6 @@ class pytestPDB(object):
@classmethod @classmethod
def set_trace(cls, *args, **kwargs): def set_trace(cls, *args, **kwargs):
"""Invoke debugging via ``Pdb.set_trace``, dropping any IO capturing.""" """Invoke debugging via ``Pdb.set_trace``, dropping any IO capturing."""
if pytestPDB._config: # Might not be available when called directly.
if pytestPDB._config.getoption("pdb_ignore_set_trace"):
return
frame = sys._getframe().f_back frame = sys._getframe().f_back
_pdb = cls._init_pdb(*args, **kwargs) _pdb = cls._init_pdb(*args, **kwargs)
_pdb.set_trace(frame) _pdb.set_trace(frame)

14
testing/test_pdb.py
View File

@ -9,7 +9,6 @@ import sys
import _pytest._code import _pytest._code
import pytest import pytest
from _pytest.debugging import _validate_usepdb_cls from _pytest.debugging import _validate_usepdb_cls
from _pytest.main import EXIT_NOTESTSCOLLECTED
try: try:
breakpoint breakpoint
@ -1123,19 +1122,6 @@ def test_pdb_suspends_fixture_capturing(testdir, fixture):
assert "> PDB continue (IO-capturing resumed for fixture %s) >" % (fixture) in rest assert "> PDB continue (IO-capturing resumed for fixture %s) >" % (fixture) in rest
def test_pdb_skip_option(testdir):
p = testdir.makepyfile(
"""
print("before_set_trace")
__import__('pdb').set_trace()
print("after_set_trace")
"""
)
result = testdir.runpytest_inprocess("--pdb-ignore-set_trace", "-s", p)
assert result.ret == EXIT_NOTESTSCOLLECTED
result.stdout.fnmatch_lines(["*before_set_trace*", "*after_set_trace*"])
def test_pdbcls_via_local_module(testdir): def test_pdbcls_via_local_module(testdir):
"""It should be imported in pytest_configure or later only.""" """It should be imported in pytest_configure or later only."""
p1 = testdir.makepyfile( p1 = testdir.makepyfile(