engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tests): explicitly disable env_expand for test suite to prevent problems with DB connections during tests

Browse source
This commit is contained in:
RhodeCode Admin 2024-10-11 14:38:37 +02:00
parent fbfb5c76ac
commit 400d24f05f
4 changed files with 25 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
configs/development.ini
View file

@ -71,6 +71,9 @@ use = egg:rhodecode-enterprise-ce
; enable proxy prefix middleware, defined above
#filter-with = proxy-prefix
; control if environmental variables to be expanded into the .ini settings
#rhodecode.env_expand = true
; #############
; DEBUG OPTIONS
; #############

3
configs/production.ini
View file

@ -71,6 +71,9 @@ use = egg:rhodecode-enterprise-ce
; enable proxy prefix middleware, defined above
#filter-with = proxy-prefix
; control if environmental variables to be expanded into the .ini settings
#rhodecode.env_expand = true
; encryption key used to encrypt social plugin tokens,
; remote_urls with credentials etc, if not set it defaults to
; `beaker.session.secret`

3
rhodecode/config/settings_maker.py
View file

@ -109,6 +109,9 @@ class SettingsMaker:
return envvar_value
def env_expand(self):
if self.settings.get('rhodecode.env_expand') == 'false':
return
replaced = {}
for k, v in self.settings.items():
if k not in set_keys:

16
rhodecode/tests/rhodecode.ini
View file

@ -71,6 +71,9 @@ use = egg:rhodecode-enterprise-ce
; enable proxy prefix middleware, defined above
#filter-with = proxy-prefix
; control if environmental variables to be expanded into the .ini settings
rhodecode.env_expand = false
; encryption key used to encrypt social plugin tokens,
; remote_urls with credentials etc, if not set it defaults to
; `beaker.session.secret`
@ -225,6 +228,13 @@ license_token = abra-cada-bra1-rce3
; This flag hides sensitive information on the license page such as token, and license data
license.hide_license_info = false
; Import EE license from this license path
#license.import_path = %(here)s/rhodecode_enterprise.license
; import license 'if-missing' or 'force' (always override)
; if-missing means apply license if it doesn't exist. 'force' option always overrides it
license.import_path_mode = if-missing
; supervisor connection uri, for managing supervisor and logs.
supervisor.uri =
@ -658,6 +668,12 @@ vcs.connection_timeout = 3600
; It uses cache_region `cache_repo`
vcs.methods.cache = false
; Filesystem location where Git lfs objects should be stored
vcs.git.lfs.storage_location = /var/opt/rhodecode_repo_store/.cache/git_lfs_store
; Filesystem location where Mercurial largefile objects should be stored
vcs.hg.largefiles.storage_location = /var/opt/rhodecode_repo_store/.cache/hg_largefiles_store
; ####################################################
; Subversion proxy support (mod_dav_svn)
; Maps RhodeCode repo groups into SVN paths for Apache