diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-05-20 13:31:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-20 13:31:53 +0200 |
| commit | 0c1ab0227df8e7d7bd9d0d0fff3337a3847e63cf (patch) | |
| tree | 09a11ac4fd807c9fd4de92cdbd0a17c49ceefca0 | |
| parent | 94e6ed6110d140d4d1006e286a05d178090d9d78 (diff) | |
| parent | d1cffc55cb5421c6c56f54124ded202a3332a676 (diff) | |
Merge pull request #84 from searxng/fix-test-ignore-etc-settings
[fix] unit test: don't load /etc/searx/settings.yml
| -rw-r--r-- | searx/settings_loader.py | 3 | ||||
| -rw-r--r-- | tests/__init__.py | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/searx/settings_loader.py b/searx/settings_loader.py index cfdeb4d91..6beab59a1 100644 --- a/searx/settings_loader.py +++ b/searx/settings_loader.py @@ -40,6 +40,9 @@ def get_user_settings_path(): # enviroment variable 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 return check_settings_yml('/etc/searx/settings.yml') diff --git a/tests/__init__.py b/tests/__init__.py index 18bf7cad8..cb43fc22a 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1,2 +1,5 @@ import os + os.environ['SEARX_DEBUG'] = '1' +os.environ['SEARX_DISABLE_ETC_SETTINGS'] = '1' +os.environ.pop('SEARX_SETTINGS_PATH', None) |