diff options
| author | Alexandre Flament <alex@al-f.net> | 2019-07-06 18:48:03 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 18:48:03 +0200 |
| commit | 3b8b862d8c31e8e55f2fc6e0de74a0fcbb899c76 (patch) | |
| tree | 36f4aebfa1b9efacb2bcda3efa93d1baca2f75f8 /searx | |
| parent | 6626f013656d39bc90d179e6706825552a8e588d (diff) | |
| parent | 3faaf34e25db09988b113f74feb6227d3df3db95 (diff) | |
| download | searxng-3b8b862d8c31e8e55f2fc6e0de74a0fcbb899c76.tar.gz searxng-3b8b862d8c31e8e55f2fc6e0de74a0fcbb899c76.zip | |
Merge branch 'master' into bang_fixes
Diffstat (limited to 'searx')
| -rw-r--r-- | searx/settings_robot.yml | 8 | ||||
| -rw-r--r-- | searx/testing.py | 4 |
2 files changed, 11 insertions, 1 deletions
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) |