Fix pytester internal plugin to work correctly with latest versions of zope.interface
Fix #1989
This commit is contained in:
parent
d15724f74f
commit
2574da8d32
|
@ -29,10 +29,6 @@ env:
|
||||||
- TESTENV=docs
|
- TESTENV=docs
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
allow_failures:
|
|
||||||
# see #1989
|
|
||||||
- env: TESTENV=py27-trial
|
|
||||||
- env: TESTENV=py35-trial
|
|
||||||
include:
|
include:
|
||||||
- env: TESTENV=py36
|
- env: TESTENV=py36
|
||||||
python: '3.6-dev'
|
python: '3.6-dev'
|
||||||
|
|
|
@ -14,6 +14,9 @@
|
||||||
expected warnings and the list of caught warnings is added to the
|
expected warnings and the list of caught warnings is added to the
|
||||||
error message. Thanks `@lesteve`_ for the PR.
|
error message. Thanks `@lesteve`_ for the PR.
|
||||||
|
|
||||||
|
* Fix ``pytester`` internal plugin to work correctly with latest versions of
|
||||||
|
``zope.interface`` (`#1989`_). Thanks `@nicoddemus`_ for the PR.
|
||||||
|
|
||||||
* Specifying tests with colons like ``test_foo.py::test_bar`` for tests in
|
* Specifying tests with colons like ``test_foo.py::test_bar`` for tests in
|
||||||
subdirectories with ini configuration files now uses the correct ini file
|
subdirectories with ini configuration files now uses the correct ini file
|
||||||
(`#2148`_). Thanks `@pelme`_.
|
(`#2148`_). Thanks `@pelme`_.
|
||||||
|
@ -24,6 +27,7 @@
|
||||||
.. _@malinoff: https://github.com/malinoff
|
.. _@malinoff: https://github.com/malinoff
|
||||||
.. _@pelme: https://github.com/pelme
|
.. _@pelme: https://github.com/pelme
|
||||||
|
|
||||||
|
.. _#1989: https://github.com/pytest-dev/pytest/issues/1989
|
||||||
.. _#2129: https://github.com/pytest-dev/pytest/issues/2129
|
.. _#2129: https://github.com/pytest-dev/pytest/issues/2129
|
||||||
.. _#2148: https://github.com/pytest-dev/pytest/issues/2148
|
.. _#2148: https://github.com/pytest-dev/pytest/issues/2148
|
||||||
.. _#2150: https://github.com/pytest-dev/pytest/issues/2150
|
.. _#2150: https://github.com/pytest-dev/pytest/issues/2150
|
||||||
|
|
|
@ -446,9 +446,9 @@ class Testdir:
|
||||||
the module is re-imported.
|
the module is re-imported.
|
||||||
"""
|
"""
|
||||||
for name in set(sys.modules).difference(self._savemodulekeys):
|
for name in set(sys.modules).difference(self._savemodulekeys):
|
||||||
# it seems zope.interfaces is keeping some state
|
# zope.interface (used by twisted-related tests) keeps internal
|
||||||
# (used by twisted related tests)
|
# state and can't be deleted
|
||||||
if name != "zope.interface":
|
if not name.startswith("zope.interface"):
|
||||||
del sys.modules[name]
|
del sys.modules[name]
|
||||||
|
|
||||||
def make_hook_recorder(self, pluginmanager):
|
def make_hook_recorder(self, pluginmanager):
|
||||||
|
|
|
@ -28,12 +28,6 @@ environment:
|
||||||
- TOXENV: "freeze"
|
- TOXENV: "freeze"
|
||||||
- TOXENV: "docs"
|
- TOXENV: "docs"
|
||||||
|
|
||||||
matrix:
|
|
||||||
allow_failures:
|
|
||||||
# see #1989
|
|
||||||
- TOXENV: "py27-trial"
|
|
||||||
- TOXENV: "py35-trial"
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
- echo Installed Pythons
|
- echo Installed Pythons
|
||||||
- dir c:\Python*
|
- dir c:\Python*
|
||||||
|
|
Loading…
Reference in New Issue