Merge branch 'master' into bang_fixes

Browse Source
This commit is contained in:
Alexandre Flament 2019-07-06 18:48:03 +02:00 committed by GitHub
commit 3b8b862d8c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manage.sh
View File

@ -35,7 +35,7 @@ install_geckodriver() {
if [ -z "$NOTFOUND" ]; then if [ -z "$NOTFOUND" ]; then
return return
fi 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])"`" PLATFORM="`python -c "import six; import platform; six.print_(platform.system().lower(), platform.architecture()[0])"`"
case "$PLATFORM" in case "$PLATFORM" in
"linux 32bit" | "linux2 32bit") ARCH="linux32";; "linux 32bit" | "linux2 32bit") ARCH="linux32";;

4
requirements-dev.txt
View File

@ -4,8 +4,8 @@ nose2[coverage_plugin]
cov-core==1.15.0 cov-core==1.15.0
pep8==1.7.0 pep8==1.7.0
plone.testing==5.0.0 plone.testing==5.0.0
splinter==0.7.5 splinter==0.11.0
transifex-client==0.12.2 transifex-client==0.12.2
unittest2==1.1.0 unittest2==1.1.0
zope.testrunner==4.5.1 zope.testrunner==4.5.1
selenium==3.5.0 selenium==3.141.0

8
searx/settings_robot.yml
View File

@ -39,3 +39,11 @@ engines:
locales: locales:
en : English en : English
hu : Magyar 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'

4
searx/testing.py
View File

@ -6,7 +6,6 @@ import os
import subprocess import subprocess
import traceback import traceback
from os.path import dirname, join, abspath from os.path import dirname, join, abspath
from splinter import Browser from splinter import Browser
@ -49,6 +48,7 @@ class SearxRobotLayer():
exe = 'python' exe = 'python'
# set robot settings path # set robot settings path
os.environ['SEARX_DEBUG'] = '1'
os.environ['SEARX_SETTINGS_PATH'] = abspath( os.environ['SEARX_SETTINGS_PATH'] = abspath(
dirname(__file__) + '/settings_robot.yml') dirname(__file__) + '/settings_robot.yml')
@ -58,6 +58,8 @@ class SearxRobotLayer():
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT stderr=subprocess.STDOUT
) )
if hasattr(self.server.stdout, 'read1'):
print(self.server.stdout.read1(1024).decode('utf-8'))
def tearDown(self): def tearDown(self):
os.kill(self.server.pid, 9) os.kill(self.server.pid, 9)