equal
deleted
inserted
replaced
35 from logilab.common.decorators import cached, clear_cache |
35 from logilab.common.decorators import cached, clear_cache |
36 |
36 |
37 from cubicweb import ExecutionError, BadConnectionId |
37 from cubicweb import ExecutionError, BadConnectionId |
38 from cubicweb import schema, cwconfig |
38 from cubicweb import schema, cwconfig |
39 from cubicweb.server.serverconfig import ServerConfiguration |
39 from cubicweb.server.serverconfig import ServerConfiguration |
40 from cubicweb.etwist.twconfig import TwistedConfiguration |
40 from cubicweb.etwist.twconfig import WebConfigurationBase |
41 |
41 |
42 cwconfig.CubicWebConfiguration.cls_adjust_sys_path() |
42 cwconfig.CubicWebConfiguration.cls_adjust_sys_path() |
43 |
43 |
44 # db auto-population configuration ############################################# |
44 # db auto-population configuration ############################################# |
45 |
45 |
211 |
211 |
212 def default_base_url(self): |
212 def default_base_url(self): |
213 return BASE_URL |
213 return BASE_URL |
214 |
214 |
215 |
215 |
216 class BaseApptestConfiguration(TestServerConfiguration, TwistedConfiguration): |
216 class BaseApptestConfiguration(TestServerConfiguration, WebConfigurationBase): |
217 name = 'all-in-one' # so it search for all-in-one.conf, not repository.conf |
217 name = 'all-in-one' # so it search for all-in-one.conf, not repository.conf |
218 options = cwconfig.merge_options(TestServerConfiguration.options |
218 options = cwconfig.merge_options(TestServerConfiguration.options |
219 + TwistedConfiguration.options) |
219 + WebConfigurationBase.options) |
220 cubicweb_appobject_path = TestServerConfiguration.cubicweb_appobject_path | TwistedConfiguration.cubicweb_appobject_path |
220 cubicweb_appobject_path = TestServerConfiguration.cubicweb_appobject_path | WebConfigurationBase.cubicweb_appobject_path |
221 cube_appobject_path = TestServerConfiguration.cube_appobject_path | TwistedConfiguration.cube_appobject_path |
221 cube_appobject_path = TestServerConfiguration.cube_appobject_path | WebConfigurationBase.cube_appobject_path |
222 |
222 |
223 def available_languages(self, *args): |
223 def available_languages(self, *args): |
224 return self.cw_languages() |
224 return self.cw_languages() |
225 |
225 |
226 def pyro_enabled(self): |
226 def pyro_enabled(self): |