backport stable
authorSylvain Thénault <sylvain.thenault@logilab.fr>
Mon, 11 Oct 2010 14:45:25 +0200
changeset 6442 ac7126d2cd73
parent 6440 9d85f11983b0 (current diff)
parent 6441 adbce42ff1b5 (diff)
child 6443 a5bed0cd3956
backport stable
devtools/__init__.py
devtools/testlib.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
--- a/devtools/testlib.py	Mon Oct 11 12:27:29 2010 +0200
+++ b/devtools/testlib.py	Mon Oct 11 14:45:25 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):