summaryrefslogtreecommitdiff
path: root/manage
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2021-07-21 09:41:48 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2021-07-24 16:28:15 +0200
commit61d3914b639dc71c00f404652e9d5da32ae7c401 (patch)
tree67ea33cd996aa8bfb3b0687694afdf47d96230aa /manage
parentb6a55e223ce0e287adeeafce8164e411154b5423 (diff)
downloadsearxng-61d3914b639dc71c00f404652e9d5da32ae7c401.tar.gz
searxng-61d3914b639dc71c00f404652e9d5da32ae7c401.zip
[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 <markus.heiser@darmarit.de>
Diffstat (limited to 'manage')
-rwxr-xr-xmanage12
1 files changed, 12 insertions, 0 deletions
diff --git a/manage b/manage
index a67bdc74e..b974c3028 100755
--- a/manage
+++ b/manage
@@ -120,6 +120,17 @@ buildenv() {
return "${PIPESTATUS[0]}"
}
+buildenv.unset_env(){
+ # Some defaults in the settings.yml are taken from the environment,
+ # e.g. SEARX_BIND_ADDRESS (:py:obj:`searx.settings_defaults.SHEMA`). In
+ # some tasks (e.g. test.robot) we do not want these envorionment applied.
+ unset GIT_URL
+ unset GIT_BRANCH
+ unset SEARX_URL
+ unset SEARX_PORT
+ unset SEARX_BIND_ADDRESS
+}
+
babel.compile() {
build_msg BABEL compile
pyenv.cmd pybabel compile -d "${REPO_ROOT}/searx/translations"
@@ -481,6 +492,7 @@ test.coverage() {
test.robot() {
build_msg TEST 'robot'
+ buildenv.unset_env
gecko.driver
PYTHONPATH=. pyenv.cmd python searx/testing.py robot
dump_return $?