Commit 75505a1c authored by Julien Muchembled's avatar Julien Muchembled

Fix a bug in ZEO-based unit tests for Zope 2.12

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@35420 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0359ec9b
...@@ -8,7 +8,6 @@ import ZODB ...@@ -8,7 +8,6 @@ import ZODB
from asyncore import socket_map from asyncore import socket_map
from ZODB.DemoStorage import DemoStorage from ZODB.DemoStorage import DemoStorage
from ZODB.FileStorage import FileStorage from ZODB.FileStorage import FileStorage
from ZEO.ClientStorage import ClientStorage
from Products.ERP5Type.tests.utils import getMySQLArguments, instance_random from Products.ERP5Type.tests.utils import getMySQLArguments, instance_random
from Products.ERP5Type.tests.runUnitTest import instance_home, static_dir_list from Products.ERP5Type.tests.runUnitTest import instance_home, static_dir_list
...@@ -114,6 +113,8 @@ else: ...@@ -114,6 +113,8 @@ else:
os.environ['zserver'] = i < len(zserver_list) and zserver_list[i] or '' os.environ['zserver'] = i < len(zserver_list) and zserver_list[i] or ''
break break
zeo_client_pid_list.append(pid) zeo_client_pid_list.append(pid)
# Zope 2.12: do not import ClientStorage before forking due to client trigger
from ZEO.ClientStorage import ClientStorage
Storage = ClientStorage(zeo_client) Storage = ClientStorage(zeo_client)
if zeo_client_pid_list is not None: if zeo_client_pid_list is not None:
......
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