diff options
author | Markus Heiser <markus.heiser@darmarIT.de> | 2020-06-12 05:34:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-12 05:34:47 +0000 |
commit | 220e6e6bfdcda1b9ba1164f8159dda07da853af4 (patch) | |
tree | 18ba968d8ba8b66a190fe62a15c7155b80ec467f | |
parent | e088b95e74882818a611e5c46593914495daf9fe (diff) | |
parent | 6fb5c6aad920b31599292bdffa1dd2ab2f7d1adc (diff) | |
download | searxng-220e6e6bfdcda1b9ba1164f8159dda07da853af4.tar.gz searxng-220e6e6bfdcda1b9ba1164f8159dda07da853af4.zip |
Merge branch 'master' into csp-oscar-theme
-rw-r--r-- | tests/unit/test_plugins.py | 18 | ||||
-rw-r--r-- | tests/unit/test_webapp.py | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tests/unit/test_plugins.py b/tests/unit/test_plugins.py index e497371f8..10de8475a 100644 --- a/tests/unit/test_plugins.py +++ b/tests/unit/test_plugins.py @@ -7,7 +7,7 @@ from mock import Mock def get_search_mock(query, **kwargs): return Mock(search_query=Mock(query=query, **kwargs), - result_container=Mock(answers=set())) + result_container=Mock(answers=dict())) class PluginStoreTest(SearxTestCase): @@ -50,11 +50,11 @@ class SelfIPTest(SearxTestCase): request.headers.getlist.return_value = [] search = get_search_mock(query=b'ip', pageno=1) store.call(store.plugins, 'post_search', request, search) - self.assertTrue('127.0.0.1' in search.result_container.answers) + self.assertTrue('127.0.0.1' in search.result_container.answers["ip"]["answer"]) search = get_search_mock(query=b'ip', pageno=2) store.call(store.plugins, 'post_search', request, search) - self.assertFalse('127.0.0.1' in search.result_container.answers) + self.assertFalse('ip' in search.result_container.answers) # User agent test request = Mock(user_agent='Mock') @@ -62,24 +62,24 @@ class SelfIPTest(SearxTestCase): search = get_search_mock(query=b'user-agent', pageno=1) store.call(store.plugins, 'post_search', request, search) - self.assertTrue('Mock' in search.result_container.answers) + self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"]) search = get_search_mock(query=b'user-agent', pageno=2) store.call(store.plugins, 'post_search', request, search) - self.assertFalse('Mock' in search.result_container.answers) + self.assertFalse('user-agent' in search.result_container.answers) search = get_search_mock(query=b'user-agent', pageno=1) store.call(store.plugins, 'post_search', request, search) - self.assertTrue('Mock' in search.result_container.answers) + self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"]) search = get_search_mock(query=b'user-agent', pageno=2) store.call(store.plugins, 'post_search', request, search) - self.assertFalse('Mock' in search.result_container.answers) + self.assertFalse('user-agent' in search.result_container.answers) search = get_search_mock(query=b'What is my User-Agent?', pageno=1) store.call(store.plugins, 'post_search', request, search) - self.assertTrue('Mock' in search.result_container.answers) + self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"]) search = get_search_mock(query=b'What is my User-Agent?', pageno=2) store.call(store.plugins, 'post_search', request, search) - self.assertFalse('Mock' in search.result_container.answers) + self.assertFalse('user-agent' in search.result_container.answers) diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index f31332fa0..f15e3c92c 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -48,7 +48,7 @@ class ViewsTestCase(SearxTestCase): def search_mock(search_self, *args): search_self.result_container = Mock(get_ordered_results=lambda: test_results, - answers=set(), + answers=dict(), corrections=set(), suggestions=set(), infoboxes=[], |