Commit c3e118dd authored by Aurel's avatar Aurel

make it zope2.12 BBB

parent 4f15a1eb
...@@ -5,7 +5,10 @@ from UserDict import IterableUserDict ...@@ -5,7 +5,10 @@ from UserDict import IterableUserDict
import Lifetime import Lifetime
import transaction import transaction
from Testing import ZopeTestCase from Testing import ZopeTestCase
from ZServer.Testing import utils try:
from ZServer.Testing import utils
except: # BBB Zope 2.12
from Testing.ZopeTestCase import utils
from ZODB.POSException import ConflictError from ZODB.POSException import ConflictError
from zLOG import LOG, ERROR from zLOG import LOG, ERROR
from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY
...@@ -148,7 +151,6 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -148,7 +151,6 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
def startZServer(self, verbose=False): def startZServer(self, verbose=False):
"""Start HTTP ZServer in background""" """Start HTTP ZServer in background"""
#utils = ZopeTestCase.utils
if utils._Z2HOST is None: if utils._Z2HOST is None:
from Products.ERP5Type.tests.runUnitTest import log_directory from Products.ERP5Type.tests.runUnitTest import log_directory
log = os.path.join(log_directory, "Z2.log") log = os.path.join(log_directory, "Z2.log")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment