Merge pull request #2211 from nicoddemus/trial-envs

Fix pytester internal plugin to work correctly with latest versions of zope.interface

.travis.yml

@@ -29,10 +29,6 @@ env:
     - TESTENV=docs
 
 matrix:
-  allow_failures:
-    # see #1989
-    - env: TESTENV=py27-trial
-    - env: TESTENV=py35-trial
   include:
     - env: TESTENV=py36
       python: '3.6-dev'

CHANGELOG.rst

@@ -14,6 +14,9 @@
   expected warnings and the list of caught warnings is added to the
   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.
+
 * Assert statements of the ``pytester`` plugin again benefit from assertion rewriting (`#1920`_).
   Thanks `@RonnyPfannschmidt`_ for the report and `@nicoddemus`_ for the PR.
 
@@ -31,6 +34,8 @@
 .. _@pelme: https://github.com/pelme
 .. _@eli-b: https://github.com/eli-b
 
+
+.. _#1989: https://github.com/pytest-dev/pytest/issues/1989
 .. _#1920: https://github.com/pytest-dev/pytest/issues/1920
 .. _#2129: https://github.com/pytest-dev/pytest/issues/2129
 .. _#2148: https://github.com/pytest-dev/pytest/issues/2148

_pytest/pytester.py

@@ -447,9 +447,9 @@ class Testdir:
         the module is re-imported.
         """
         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]
 
     def make_hook_recorder(self, pluginmanager):

appveyor.yml

@@ -28,12 +28,6 @@ environment:
   - TOXENV: "freeze"
   - TOXENV: "docs"
 
-matrix:
-  allow_failures:
-    # see #1989
-    - TOXENV: "py27-trial"
-    - TOXENV: "py35-trial"
-
 install:
   - echo Installed Pythons
   - dir c:\Python*