diff options
| author | Alexandre Flament <alex@al-f.net> | 2019-08-02 13:50:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-02 13:50:51 +0200 |
| commit | 72029d27ded8d93ab891c616d6bffbe8d3a67dd2 (patch) | |
| tree | 135388ae0dbd97abe3855745ba627c2ab181e975 /tests/unit/test_search.py | |
| parent | 2179079a9173b33b81e1084fc1e8e181c19ef8e9 (diff) | |
| download | searxng-72029d27ded8d93ab891c616d6bffbe8d3a67dd2.tar.gz searxng-72029d27ded8d93ab891c616d6bffbe8d3a67dd2.zip | |
[enh] Add timeout limit per request (#1640)
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
Diffstat (limited to 'tests/unit/test_search.py')
| -rw-r--r-- | tests/unit/test_search.py | 56 |
1 files changed, 53 insertions, 3 deletions
diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py index af5fffd8b..a39786d1a 100644 --- a/tests/unit/test_search.py +++ b/tests/unit/test_search.py @@ -2,9 +2,59 @@ from searx.testing import SearxTestCase +import searx.preferences +import searx.search +import searx.engines + -# TODO class SearchTestCase(SearxTestCase): - def test_(self): - pass + @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) |