OwlBurst/Ponysearch
1
0
Fork 0
forked from Ponysearch/Ponysearch
Code Pull requests Activity

[fix] unit test: don't load /etc/searx/settings.yml

Browse source 
Add a new environment variable SEARX_DISABLE_ETC_SETTINGS
to disable loading of /etc/searx/settings.yml

unit tests:
* set SEARX_DISABLE_ETC_SETTINGS to 1
* remove SEARX_SETTINGS_PATH if it exists
This commit is contained in:
Alexandre Flament 2021-05-18 17:23:21 +02:00
parent d255e5637b
commit d1cffc55cb
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
searx/settings_loader.py
View file

@ -40,6 +40,9 @@ def get_user_settings_path():
# enviroment variable SEARX_SETTINGS_PATH # enviroment variable SEARX_SETTINGS_PATH
return check_settings_yml(environ['SEARX_SETTINGS_PATH']) return check_settings_yml(environ['SEARX_SETTINGS_PATH'])
if environ.get('SEARX_DISABLE_ETC_SETTINGS', '').lower() in ('1', 'true'):
return None
# if not, get it from searx code base or last solution from /etc/searx # if not, get it from searx code base or last solution from /etc/searx
return check_settings_yml('/etc/searx/settings.yml') return check_settings_yml('/etc/searx/settings.yml')

3
tests/__init__.py
View file

@ -1,2 +1,5 @@
import os import os
os.environ['SEARX_DEBUG'] = '1' os.environ['SEARX_DEBUG'] = '1'
os.environ['SEARX_DISABLE_ETC_SETTINGS'] = '1'
os.environ.pop('SEARX_SETTINGS_PATH', None)