From 61d3914b639dc71c00f404652e9d5da32ae7c401 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 21 Jul 2021 09:41:48 +0200 Subject: [fix] test.robot - do not use environment from ./utils/brand.env Some defaults in the settings.yml are taken from the environment. By example; The manage scripts sources the ./utils/brand.env and sets SEARX_PORT environment. This enviroment *wins over* any settings in a YAML file. Whe we run a:: make test.robot The searx/settings_robot.yml is used, in this file the server settings are:: server: port: 11111 bind_address: 127.0.0.1 To get in use of the 'port: 11111' we have to unset the SEARX_PORT environment which was sourced before. The function buildenv.unset_env() can be called in all use cases where the enviroment from ./utils/brand.env is not wanted. ATM it unset the enviroment variables:: unset GIT_URL unset GIT_BRANCH unset SEARX_URL unset SEARX_PORT unset SEARX_BIND_ADDRESS Signed-off-by: Markus Heiser --- utils/build_env.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'utils') diff --git a/utils/build_env.py b/utils/build_env.py index 28674f923..dc55bd0a8 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -24,8 +24,9 @@ def _env(*arg, **kwargs): return val # If you add or remove variables here, do not forgett to update: -# - docs/admin/engines/settings.rst -# - /docs/dev/makefile.rst (section make buildenv) +# - ./docs/admin/engines/settings.rst +# - ./docs/dev/makefile.rst (section make buildenv) +# - ./manage function buildenv.unset_env() name_val = [ -- cgit v1.2.3