mirror of
https://github.com/searxng/searxng.git
synced 2024-11-22 20:17:45 +01:00
72029d27de
The new url parameter "timeout_limit" set timeout limit defined in second. Example "timeout_limit=1.5" means the timeout limit is 1.5 seconds. In addition, the query can start with <[number] to set the timeout limit. For number between 0 and 99, the unit is the second : Example: "<30 searx" means the timeout limit is 3 seconds For number above 100, the unit is the millisecond: Example: "<850 searx" means the timeout is 850 milliseconds. In addition, there is a new optional setting: outgoing.max_request_timeout. If not set, the user timeout can't go above searx configuration (as before: the max timeout of selected engine for a query). If the value is set, the user can set a timeout between 0 and max_request_timeout using <[number] or timeout_limit query parameter. Related to #1077 Updated version of PR #1413 from @isj-privacore
61 lines
2.5 KiB
Python
61 lines
2.5 KiB
Python
# -*- coding: utf-8 -*-
|
|
|
|
from searx.testing import SearxTestCase
|
|
|
|
import searx.preferences
|
|
import searx.search
|
|
import searx.engines
|
|
|
|
|
|
class SearchTestCase(SearxTestCase):
|
|
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
searx.engines.initialize_engines([{
|
|
'name': 'general dummy',
|
|
'engine': 'dummy',
|
|
'categories': 'general',
|
|
'shortcut': 'gd',
|
|
'timeout': 3.0
|
|
}])
|
|
|
|
def test_timeout_simple(self):
|
|
searx.search.max_request_timeout = None
|
|
search_query = searx.query.SearchQuery('test', [{'category': 'general', 'name': 'general dummy'}],
|
|
['general'], 'en-US', 0, 1, None, None)
|
|
search = searx.search.Search(search_query)
|
|
search.search()
|
|
self.assertEquals(search.actual_timeout, 3.0)
|
|
|
|
def test_timeout_query_above_default_nomax(self):
|
|
searx.search.max_request_timeout = None
|
|
search_query = searx.query.SearchQuery('test', [{'category': 'general', 'name': 'general dummy'}],
|
|
['general'], 'en-US', 0, 1, None, 5.0)
|
|
search = searx.search.Search(search_query)
|
|
search.search()
|
|
self.assertEquals(search.actual_timeout, 3.0)
|
|
|
|
def test_timeout_query_below_default_nomax(self):
|
|
searx.search.max_request_timeout = None
|
|
search_query = searx.query.SearchQuery('test', [{'category': 'general', 'name': 'general dummy'}],
|
|
['general'], 'en-US', 0, 1, None, 1.0)
|
|
search = searx.search.Search(search_query)
|
|
search.search()
|
|
self.assertEquals(search.actual_timeout, 1.0)
|
|
|
|
def test_timeout_query_below_max(self):
|
|
searx.search.max_request_timeout = 10.0
|
|
search_query = searx.query.SearchQuery('test', [{'category': 'general', 'name': 'general dummy'}],
|
|
['general'], 'en-US', 0, 1, None, 5.0)
|
|
search = searx.search.Search(search_query)
|
|
search.search()
|
|
self.assertEquals(search.actual_timeout, 5.0)
|
|
|
|
def test_timeout_query_above_max(self):
|
|
searx.search.max_request_timeout = 10.0
|
|
search_query = searx.query.SearchQuery('test', [{'category': 'general', 'name': 'general dummy'}],
|
|
['general'], 'en-US', 0, 1, None, 15.0)
|
|
search = searx.search.Search(search_query)
|
|
search.search()
|
|
self.assertEquals(search.actual_timeout, 10.0)
|