p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into allow_skipping_unittests_with_pdb_active

This commit is contained in:
Bruno Oliveira 2017-02-01 15:53:14 -02:00 committed by GitHub
parent 36b6f17727 da5a3dba87
commit 176c680e19
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.rst
View File

@ -1,9 +1,12 @@
3.0.7 (unreleased) 3.0.7 (unreleased)
======================= ==================
* Fix regression, pytest now skips unittest correctly if run with ``--pdb`` * Fix regression, pytest now skips unittest correctly if run with ``--pdb``
(`#2137`_). Thanks to `@gst`_ for the report and `@mbyt`_ for the PR. (`#2137`_). Thanks to `@gst`_ for the report and `@mbyt`_ for the PR.
* Replace ``raise StopIteration`` usages in the code by simple ``returns`` to finish generators, in accordance to `PEP-479`_ (`#2160`_).
Thanks `@tgoodlet`_ for the report and `@nicoddemus`_ for the PR.
* *
* *
@ -13,6 +16,9 @@
.. _@gst: https://github.com/gst .. _@gst: https://github.com/gst
.. _#2137: https://github.com/pytest-dev/pytest/issues/2137 .. _#2137: https://github.com/pytest-dev/pytest/issues/2137
.. _#2160: https://github.com/pytest-dev/pytest/issues/2160
.. _PEP-479: https://www.python.org/dev/peps/pep-0479/
3.0.6 (2017-01-22) 3.0.6 (2017-01-22)

2
_pytest/python.py
View File

@ -174,7 +174,7 @@ def pytest_pycollect_makeitem(collector, name, obj):
outcome = yield outcome = yield
res = outcome.get_result() res = outcome.get_result()
if res is not None: if res is not None:
raise StopIteration return
# nothing was collected elsewhere, let's do it here # nothing was collected elsewhere, let's do it here
if isclass(obj): if isclass(obj):
if collector.istestclass(obj, name): if collector.istestclass(obj, name):