From c7e39d6864b33a88b0ba4f3f3372fb74ebed854d Mon Sep 17 00:00:00 2001 From: thet Date: Sat, 29 Jun 2019 20:22:26 +0200 Subject: [PATCH] [fc] Repository: plone.testing Branch: refs/heads/master Date: 2019-06-29T19:40:28+02:00 Author: Johannes Raggam (thet) Commit: https://github.com/plone/plone.testing/commit/244a69852e7351082b4e16e3689ceab9709862ff Fix injection of ZopeLite test configuration into the global Zope configuration. Fixese #64 Files changed: A news/65.bugfix M src/plone/testing/zope.py Repository: plone.testing Branch: refs/heads/master Date: 2019-06-29T20:22:26+02:00 Author: Johannes Raggam (thet) Commit: https://github.com/plone/plone.testing/commit/5618f7949a3af9c56b357ada1133677590c1d19e Merge pull request #65 from plone/thet-fix-64 Fix injection of ZopeLite test configuration into the global Zope configuration. Files changed: A news/65.bugfix M src/plone/testing/zope.py --- last_commit.txt | 49 ++++++++++++++++++------------------------------- 1 file changed, 18 insertions(+), 31 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index d1c4296dc7..419a397b3d 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,48 +1,35 @@ -Repository: Products.CMFPlone +Repository: plone.testing Branch: refs/heads/master -Date: 2019-06-29T09:39:50+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFPlone/commit/314419864660a2a7d3e3d9665d27bd38c568b4f7 +Date: 2019-06-29T19:40:28+02:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/plone.testing/commit/244a69852e7351082b4e16e3689ceab9709862ff -Declare support for Python 3.8 +Fix injection of ZopeLite test configuration into the global Zope configuration. +Fixese #64 Files changed: -M setup.py +A news/65.bugfix +M src/plone/testing/zope.py -b'diff --git a/setup.py b/setup.py\nindex b1fe8a95c..99c10f169 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -23,6 +23,7 @@\n "Programming Language :: Python :: 2.7",\n "Programming Language :: Python :: 3.6",\n "Programming Language :: Python :: 3.7",\n+ "Programming Language :: Python :: 3.8",\n "Topic :: Internet :: WWW/HTTP :: Dynamic Content",\n ],\n keywords=\'Plone CMF Python Zope CMS Webapplication\',\n' +b'diff --git a/news/65.bugfix b/news/65.bugfix\nnew file mode 100644\nindex 0000000..9d5ba42\n--- /dev/null\n+++ b/news/65.bugfix\n@@ -0,0 +1,3 @@\n+Fix injection of ZopeLite test configuration into the global Zope configuration.\n+Fixes #64\n+[thet]\ndiff --git a/src/plone/testing/zope.py b/src/plone/testing/zope.py\nindex 6af2c81..b2f6c56 100644\n--- a/src/plone/testing/zope.py\n+++ b/src/plone/testing/zope.py\n@@ -7,7 +7,6 @@\n from plone.testing import zca\n from plone.testing import zodb\n from plone.testing._z2_testbrowser import Browser # noqa\n-from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT\n from webtest.http import StopableWSGIServer\n from Zope2.App.schema import Zope2VocabularyRegistry\n from zope.schema.vocabulary import getVocabularyRegistry\n@@ -461,6 +460,11 @@ def setUpDatabase(self):\n that the database that is opened by Zope 2 is in fact the top of\n the resource stack.\n """\n+\n+ # NOTE: Keep that import here.\n+ # Having it on module-level has the side effect of injecting the\n+ # ZopeLite test configuration into the global Zope configuration.\n+ from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT\n if ZOPETESTCASEALERT:\n raise Exception(\'You try to run plone.testing tests together with \'\n \'ZopeTestCase tests. This will result in random \'\n' -Repository: Products.CMFPlone +Repository: plone.testing Branch: refs/heads/master -Date: 2019-06-29T09:41:42+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFPlone/commit/d6f291f80603110891a63e3e5bd7ebd89c7a7897 +Date: 2019-06-29T20:22:26+02:00 +Author: Johannes Raggam (thet) +Commit: https://github.com/plone/plone.testing/commit/5618f7949a3af9c56b357ada1133677590c1d19e -add changenote +Merge pull request #65 from plone/thet-fix-64 -Files changed: -A news/2904.bugfix - -b'diff --git a/news/2904.bugfix b/news/2904.bugfix\nnew file mode 100644\nindex 000000000..1512b92df\n--- /dev/null\n+++ b/news/2904.bugfix\n@@ -0,0 +1,2 @@\n+Declare support for Python 3.8.\n+[pbauer]\n\\ No newline at end of file\n' - -Repository: Products.CMFPlone - - -Branch: refs/heads/master -Date: 2019-06-29T16:36:21+02:00 -Author: Philip Bauer (pbauer) -Commit: https://github.com/plone/Products.CMFPlone/commit/871bf6798615a19a73e8b515c4750ea3551dc3c2 - -Merge pull request #2904 from plone/declare_support_for_py38 - -Declare support for Python 3.8 +Fix injection of ZopeLite test configuration into the global Zope configuration. Files changed: -A news/2904.bugfix -M setup.py +A news/65.bugfix +M src/plone/testing/zope.py -b'diff --git a/news/2904.bugfix b/news/2904.bugfix\nnew file mode 100644\nindex 000000000..1512b92df\n--- /dev/null\n+++ b/news/2904.bugfix\n@@ -0,0 +1,2 @@\n+Declare support for Python 3.8.\n+[pbauer]\n\\ No newline at end of file\ndiff --git a/setup.py b/setup.py\nindex b1fe8a95c..99c10f169 100644\n--- a/setup.py\n+++ b/setup.py\n@@ -23,6 +23,7 @@\n "Programming Language :: Python :: 2.7",\n "Programming Language :: Python :: 3.6",\n "Programming Language :: Python :: 3.7",\n+ "Programming Language :: Python :: 3.8",\n "Topic :: Internet :: WWW/HTTP :: Dynamic Content",\n ],\n keywords=\'Plone CMF Python Zope CMS Webapplication\',\n' +b'diff --git a/news/65.bugfix b/news/65.bugfix\nnew file mode 100644\nindex 0000000..9d5ba42\n--- /dev/null\n+++ b/news/65.bugfix\n@@ -0,0 +1,3 @@\n+Fix injection of ZopeLite test configuration into the global Zope configuration.\n+Fixes #64\n+[thet]\ndiff --git a/src/plone/testing/zope.py b/src/plone/testing/zope.py\nindex 6af2c81..b2f6c56 100644\n--- a/src/plone/testing/zope.py\n+++ b/src/plone/testing/zope.py\n@@ -7,7 +7,6 @@\n from plone.testing import zca\n from plone.testing import zodb\n from plone.testing._z2_testbrowser import Browser # noqa\n-from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT\n from webtest.http import StopableWSGIServer\n from Zope2.App.schema import Zope2VocabularyRegistry\n from zope.schema.vocabulary import getVocabularyRegistry\n@@ -461,6 +460,11 @@ def setUpDatabase(self):\n that the database that is opened by Zope 2 is in fact the top of\n the resource stack.\n """\n+\n+ # NOTE: Keep that import here.\n+ # Having it on module-level has the side effect of injecting the\n+ # ZopeLite test configuration into the global Zope configuration.\n+ from Testing.ZopeTestCase.ZopeLite import _patched as ZOPETESTCASEALERT\n if ZOPETESTCASEALERT:\n raise Exception(\'You try to run plone.testing tests together with \'\n \'ZopeTestCase tests. This will result in random \'\n'