Commit 6298e38d authored by Stefan H. Holek's avatar Stefan H. Holek

Collector #1260: Testing/__init__.py no longer changes the INSTANCE_HOME.

parent b576454b
......@@ -102,6 +102,9 @@ Zope Changes
(such as storages, databases, or logging handlers) to be used.
Bugs fixed
- Collector #1260: Testing/__init__.py no longer changes the
INSTANCE_HOME.
- App.config.setConfiguration() did not update the legacy source
for debug_mode, Globals.DevelopmentMode.
......
......@@ -13,7 +13,7 @@
"""
Set up testing environment
$Id: __init__.py,v 1.8 2003/02/11 17:17:08 fdrake Exp $
$Id: __init__.py,v 1.9 2004/03/22 16:25:02 shh Exp $
"""
import os
......@@ -21,8 +21,8 @@ import App.config
cfg = App.config.getConfiguration()
# Set the INSTANCE_HOME to the Testing package directory
cfg.instancehome = os.path.dirname(__file__)
# Set testinghome to the Testing package directory
cfg.testinghome = os.path.dirname(__file__)
# Make sure this change is propogated to all the legacy locations for
# this information.
......
......@@ -47,7 +47,10 @@ def startup():
# Open the database
try:
# Try to use custom storage
m=imp.find_module('custom_zodb',[getConfiguration().instancehome])
try:
m=imp.find_module('custom_zodb',[getConfiguration().testinghome])
except:
m=imp.find_module('custom_zodb',[getConfiguration().instancehome])
except:
# if there is no custom_zodb, use the config file specified databases
configuration = getConfiguration()
......
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