Merge pull request #4854 from blueyed/pdb-skip

pdb: add option to skip `pdb.set_trace()`

1 files changed, 10 insertions, 0 deletions

diff --git a/src/_pytest/debugging.py b/src/_pytest/debugging.py
index cb1c964c3..3743d31ff 100644
--- a/src/_pytest/debugging.py
+++ b/src/_pytest/debugging.py
@@ -59,6 +59,13 @@ def pytest_addoption(parser):
         action="store_true",
         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 pytest_configure(config):
@@ -209,6 +216,9 @@ class pytestPDB(object):
     @classmethod
     def set_trace(cls, *args, **kwargs):
         """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
         _pdb = cls._init_pdb(*args, **kwargs)
         _pdb.set_trace(frame)