--- a/devtools/__init__.py Fri Oct 22 13:09:09 2010 +0200
+++ b/devtools/__init__.py Fri Oct 22 13:10:37 2010 +0200
@@ -100,7 +100,14 @@
}),
))
- def __init__(self, appid, log_threshold=logging.CRITICAL+10):
+ def __init__(self, appid, apphome=None, log_threshold=logging.CRITICAL+10):
+ # must be set before calling parent __init__
+ if apphome is None:
+ if exists(self.appid):
+ apphome = abspath(self.appid)
+ else: # cube test
+ apphome = abspath('..')
+ self._apphome = apphome
ServerConfiguration.__init__(self, appid)
self.init_log(log_threshold, force=True)
# need this, usually triggered by cubicweb-ctl
@@ -110,10 +117,7 @@
@property
def apphome(self):
- if exists(self.appid):
- return abspath(self.appid)
- # cube test
- return abspath('..')
+ return self._apphome
appdatahome = apphome
def load_configuration(self):
@@ -187,8 +191,10 @@
# XXX merge with BaseApptestConfiguration ?
class ApptestConfiguration(BaseApptestConfiguration):
- def __init__(self, appid, log_threshold=logging.CRITICAL, sourcefile=None):
- BaseApptestConfiguration.__init__(self, appid, log_threshold=log_threshold)
+ def __init__(self, appid, apphome=None,
+ log_threshold=logging.CRITICAL, sourcefile=None):
+ BaseApptestConfiguration.__init__(self, appid, apphome,
+ log_threshold=log_threshold)
self.init_repository = sourcefile is None
self.sourcefile = sourcefile