diff -r 9d85f11983b0 -r ac7126d2cd73 devtools/__init__.py --- a/devtools/__init__.py Mon Oct 11 12:27:29 2010 +0200 +++ b/devtools/__init__.py Mon Oct 11 14:45:25 2010 +0200 @@ -127,9 +127,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() @@ -162,6 +159,15 @@ sources['admin'] = DEFAULT_SOURCES['admin'] 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' @@ -173,9 +179,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