tests: fixed test suite for celery adoption
This commit is contained in:
parent
840634c16f
commit
1d5d2c0155
209 changed files with 5248 additions and 5275 deletions
|
|
@ -30,7 +30,7 @@ from rhodecode.lib.vcs import connect_vcs
|
|||
log = logging.getLogger(__name__)
|
||||
|
||||
|
||||
def propagate_rhodecode_config(global_config, settings, config):
|
||||
def propagate_rhodecode_config(global_config, settings, config, full=True):
|
||||
# Store the settings to make them available to other modules.
|
||||
settings_merged = global_config.copy()
|
||||
settings_merged.update(settings)
|
||||
|
|
@ -40,7 +40,7 @@ def propagate_rhodecode_config(global_config, settings, config):
|
|||
rhodecode.PYRAMID_SETTINGS = settings_merged
|
||||
rhodecode.CONFIG = settings_merged
|
||||
|
||||
if 'default_user_id' not in rhodecode.CONFIG:
|
||||
if full and 'default_user_id' not in rhodecode.CONFIG:
|
||||
rhodecode.CONFIG['default_user_id'] = utils.get_default_user_id()
|
||||
log.debug('set rhodecode.CONFIG data')
|
||||
|
||||
|
|
@ -93,6 +93,7 @@ def load_pyramid_environment(global_config, settings):
|
|||
# first run, to store data...
|
||||
propagate_rhodecode_config(global_config, settings, {})
|
||||
|
||||
|
||||
if vcs_server_enabled:
|
||||
connect_vcs(vcs_server_uri, utils.get_vcs_server_protocol(settings))
|
||||
else:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue