Skip to content

Commit

Permalink
Revert "Fix injection of ZopeLite test configuration into the global …
Browse files Browse the repository at this point in the history
…Zope configuration."
  • Loading branch information
thet authored Jul 1, 2019
1 parent 5618f79 commit b417a74
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
3 changes: 0 additions & 3 deletions news/65.bugfix

This file was deleted.

6 changes: 1 addition & 5 deletions src/plone/testing/zope.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
from plone.testing import zca
from plone.testing import zodb
from plone.testing._z2_testbrowser import Browser # noqa
from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT
from webtest.http import StopableWSGIServer
from Zope2.App.schema import Zope2VocabularyRegistry
from zope.schema.vocabulary import getVocabularyRegistry
Expand Down Expand Up @@ -460,11 +461,6 @@ def setUpDatabase(self):
that the database that is opened by Zope 2 is in fact the top of
the resource stack.
"""

# NOTE: Keep that import here.
# Having it on module-level has the side effect of injecting the
# ZopeLite test configuration into the global Zope configuration.
from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT
if ZOPETESTCASEALERT:
raise Exception('You try to run plone.testing tests together with '
'ZopeTestCase tests. This will result in random '
Expand Down

0 comments on commit b417a74

Please sign in to comment.