Skip to content

Commit

Permalink
Merge pull request pytest-dev#1663 from aostr/master
Browse files Browse the repository at this point in the history
Rename the default plugin "pdb" into "debugging"
  • Loading branch information
nicoddemus authored Jun 25, 2016
2 parents e024214 + 9a5224e commit c519b95
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@
Thanks `@bagerard`_ for reporting (`#1503`_). Thanks to `@davehunt`_ and
`@tomviner`_ for PR.

* Renamed the pytest ``pdb`` module (plugin) into ``debugging``.

*

* ImportErrors in plugins now are a fatal error instead of issuing a
Expand Down
2 changes: 1 addition & 1 deletion _pytest/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class UsageError(Exception):
_preinit = []

default_plugins = (
"mark main terminal runner python pdb unittest capture skipping "
"mark main terminal runner python debugging unittest capture skipping "
"tmpdir monkeypatch recwarn pastebin helpconfig nose assertion genscript "
"junitxml resultlog doctest cacheprovider").split()

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion testing/test_pdb.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def pytest_funcarg__pdblist(self, request):
pdblist = []
def mypdb(*args):
pdblist.append(args)
plugin = request.config.pluginmanager.getplugin('pdb')
plugin = request.config.pluginmanager.getplugin('debugging')
monkeypatch.setattr(plugin, 'post_mortem', mypdb)
return pdblist

Expand Down

0 comments on commit c519b95

Please sign in to comment.