[Erp5-report] r35420 jm - /erp5/trunk/products/ERP5Type/tests/custom_zodb.py

[nobody at svn.erp5.org]

Author: jm
Date: Tue May 18 11:28:59 2010
New Revision: 35420

URL: http://svn.erp5.org?rev=35420&view=rev
Log:
Fix a bug in ZEO-based unit tests for Zope 2.12

Modified:
    erp5/trunk/products/ERP5Type/tests/custom_zodb.py

Modified: erp5/trunk/products/ERP5Type/tests/custom_zodb.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/tests/custom_zodb.py?rev=35420&r1=35419&r2=35420&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/tests/custom_zodb.py [utf8] (original)
+++ erp5/trunk/products/ERP5Type/tests/custom_zodb.py [utf8] Tue May 18 11:28:59 2010
@@ -8,7 +8,6 @@
 from asyncore import socket_map
 from ZODB.DemoStorage import DemoStorage
 from ZODB.FileStorage import FileStorage
-from ZEO.ClientStorage import ClientStorage
 from Products.ERP5Type.tests.utils import getMySQLArguments, instance_random
 from Products.ERP5Type.tests.runUnitTest import instance_home, static_dir_list
 
@@ -114,6 +113,8 @@
       os.environ['zserver'] = i < len(zserver_list) and zserver_list[i] or ''
       break
     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)
 
 if zeo_client_pid_list is not None: