git.iko.soy/searx
on master help sign in
Merge pull request #1992 from return42/2c6531b2-hotfix

[fix] commit 2c6531b2 breaks the unit test, this is a hotfix

commit6fb5c6aad920b31599292bdffa1dd2ab2f7d1adc authorMarkus Heiser <markus.heiser@darmarIT.de> dateFri 12 Jun 2020, 05:32 (6 years ago) parentaa7c043eae3481
2 files changed+10−10
compare with master
unifiedsplit
tests/unit/test_plugins.py+9−9 tests/unit/test_webapp.py+1−1
tests/unit/test_plugins.py+9−9
@@ -7,7 +7,7 @@ from mock import Mock
77
88def get_search_mock(query, **kwargs):
99 return Mock(search_query=Mock(query=query, **kwargs),
10− result_container=Mock(answers=set()))
10+ result_container=Mock(answers=dict()))
1111
1212
1313class PluginStoreTest(SearxTestCase):
@@ -50,11 +50,11 @@ class SelfIPTest(SearxTestCase):
5050 request.headers.getlist.return_value = []
5151 search = get_search_mock(query=b'ip', pageno=1)
5252 store.call(store.plugins, 'post_search', request, search)
53− self.assertTrue('127.0.0.1' in search.result_container.answers)
53+ self.assertTrue('127.0.0.1' in search.result_container.answers["ip"]["answer"])
5454
5555 search = get_search_mock(query=b'ip', pageno=2)
5656 store.call(store.plugins, 'post_search', request, search)
57− self.assertFalse('127.0.0.1' in search.result_container.answers)
57+ self.assertFalse('ip' in search.result_container.answers)
5858
5959 # User agent test
6060 request = Mock(user_agent='Mock')
@@ -62,24 +62,24 @@ class SelfIPTest(SearxTestCase):
6262
6363 search = get_search_mock(query=b'user-agent', pageno=1)
6464 store.call(store.plugins, 'post_search', request, search)
65− self.assertTrue('Mock' in search.result_container.answers)
65+ self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"])
6666
6767 search = get_search_mock(query=b'user-agent', pageno=2)
6868 store.call(store.plugins, 'post_search', request, search)
69− self.assertFalse('Mock' in search.result_container.answers)
69+ self.assertFalse('user-agent' in search.result_container.answers)
7070
7171 search = get_search_mock(query=b'user-agent', pageno=1)
7272 store.call(store.plugins, 'post_search', request, search)
73− self.assertTrue('Mock' in search.result_container.answers)
73+ self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"])
7474
7575 search = get_search_mock(query=b'user-agent', pageno=2)
7676 store.call(store.plugins, 'post_search', request, search)
77− self.assertFalse('Mock' in search.result_container.answers)
77+ self.assertFalse('user-agent' in search.result_container.answers)
7878
7979 search = get_search_mock(query=b'What is my User-Agent?', pageno=1)
8080 store.call(store.plugins, 'post_search', request, search)
81− self.assertTrue('Mock' in search.result_container.answers)
81+ self.assertTrue('Mock' in search.result_container.answers["user-agent"]["answer"])
8282
8383 search = get_search_mock(query=b'What is my User-Agent?', pageno=2)
8484 store.call(store.plugins, 'post_search', request, search)
85− self.assertFalse('Mock' in search.result_container.answers)
85+ self.assertFalse('user-agent' in search.result_container.answers)
tests/unit/test_webapp.py+1−1
@@ -48,7 +48,7 @@ class ViewsTestCase(SearxTestCase):
4848
4949 def search_mock(search_self, *args):
5050 search_self.result_container = Mock(get_ordered_results=lambda: test_results,
51− answers=set(),
51+ answers=dict(),
5252 corrections=set(),
5353 suggestions=set(),
5454 infoboxes=[],