--- a/devtools/__init__.py Mon Oct 11 12:27:17 2010 +0200
+++ b/devtools/__init__.py Mon Oct 11 13:40:18 2010 +0200
@@ -138,9 +138,6 @@
"""return instance's control configuration file"""
return join(self.apphome, '%s.conf' % self.name)
- def instance_md5_version(self):
- return ''
-
def bootstrap_cubes(self):
try:
super(TestServerConfiguration, self).bootstrap_cubes()
@@ -171,6 +168,15 @@
sources = DEFAULT_SOURCES
return sources
+ # web config methods needed here for cases when we use this config as a web
+ # config
+
+ def instance_md5_version(self):
+ return ''
+
+ def default_base_url(self):
+ return BASE_URL
+
class BaseApptestConfiguration(TestServerConfiguration, TwistedConfiguration):
repo_method = 'inmemory'
@@ -182,9 +188,6 @@
def available_languages(self, *args):
return ('en', 'fr', 'de')
- def default_base_url(self):
- return BASE_URL
-
def pyro_enabled(self):
# but export PYRO_MULTITHREAD=0 or you get problems with sqlite and
# threads
--- a/devtools/testlib.py Mon Oct 11 12:27:17 2010 +0200
+++ b/devtools/testlib.py Mon Oct 11 13:40:18 2010 +0200
@@ -187,7 +187,7 @@
appid = 'data'
configcls = devtools.ApptestConfiguration
reset_schema = reset_vreg = False # reset schema / vreg between tests
- tags= TestCase.tags | Tags('cubicweb', 'cw_repo')
+ tags = TestCase.tags | Tags('cubicweb', 'cw_repo')
@classproperty
def config(cls):