From 3faaf34e25db09988b113f74feb6227d3df3db95 Mon Sep 17 00:00:00 2001 From: Alexandre Flament Date: Sat, 6 Jul 2019 18:47:35 +0200 Subject: [PATCH] Fix ./manage.sh robot_tests (#1633) doi_resolvers / default_doi_resolver were missing in the settings_robots.yml file, so the test server was not able to start (crash). Since the output wasn't displayed, it was not obvious why the Selenium couldn't connect to searx. --- manage.sh | 2 +- requirements-dev.txt | 4 ++-- searx/settings_robot.yml | 8 ++++++++ searx/testing.py | 4 +++- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/manage.sh b/manage.sh index a352ccc6e..c564827ac 100755 --- a/manage.sh +++ b/manage.sh @@ -35,7 +35,7 @@ install_geckodriver() { if [ -z "$NOTFOUND" ]; then return fi - GECKODRIVER_VERSION="v0.19.1" + GECKODRIVER_VERSION="v0.24.0" PLATFORM="`python -c "import six; import platform; six.print_(platform.system().lower(), platform.architecture()[0])"`" case "$PLATFORM" in "linux 32bit" | "linux2 32bit") ARCH="linux32";; diff --git a/requirements-dev.txt b/requirements-dev.txt index 4085b8de0..86b99f8b6 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -4,8 +4,8 @@ nose2[coverage_plugin] cov-core==1.15.0 pep8==1.7.0 plone.testing==5.0.0 -splinter==0.7.5 +splinter==0.11.0 transifex-client==0.12.2 unittest2==1.1.0 zope.testrunner==4.5.1 -selenium==3.5.0 +selenium==3.141.0 diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml index 070a0edb6..635809041 100644 --- a/searx/settings_robot.yml +++ b/searx/settings_robot.yml @@ -39,3 +39,11 @@ engines: locales: en : English hu : Magyar + +doi_resolvers : + oadoi.org : 'https://oadoi.org/' + doi.org : 'https://doi.org/' + doai.io : 'http://doai.io/' + sci-hub.tw : 'http://sci-hub.tw/' + +default_doi_resolver : 'oadoi.org' diff --git a/searx/testing.py b/searx/testing.py index 0d17b2a08..647c236fd 100644 --- a/searx/testing.py +++ b/searx/testing.py @@ -6,7 +6,6 @@ import os import subprocess import traceback - from os.path import dirname, join, abspath from splinter import Browser @@ -49,6 +48,7 @@ class SearxRobotLayer(): exe = 'python' # set robot settings path + os.environ['SEARX_DEBUG'] = '1' os.environ['SEARX_SETTINGS_PATH'] = abspath( dirname(__file__) + '/settings_robot.yml') @@ -58,6 +58,8 @@ class SearxRobotLayer(): stdout=subprocess.PIPE, stderr=subprocess.STDOUT ) + if hasattr(self.server.stdout, 'read1'): + print(self.server.stdout.read1(1024).decode('utf-8')) def tearDown(self): os.kill(self.server.pid, 9)