@@ -7,7 +7,7 @@ from mock import Mock
8def get_search_mock(query, **kwargs):
8def get_search_mock(query, **kwargs):
9 return Mock(search_query=Mock(query=query, **kwargs),
9 return Mock(search_query=Mock(query=query, **kwargs),
10− result_container=Mock(answers=set()))
10+ result_container=Mock(answers=dict()))
13class PluginStoreTest(SearxTestCase):
13class PluginStoreTest(SearxTestCase):
@@ -50,11 +50,11 @@ class SelfIPTest(SearxTestCase):
50 request.headers.getlist.return_value = []
50 request.headers.getlist.return_value = []
51 search = get_search_mock(query=b'ip', pageno=1)
51 search = get_search_mock(query=b'ip', pageno=1)
52 store.call(store.plugins, 'post_search', request, search)
52 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"])
55 search = get_search_mock(query=b'ip', pageno=2)
55 search = get_search_mock(query=b'ip', pageno=2)
56 store.call(store.plugins, 'post_search', request, search)
56 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)
59 # User agent test
59 # User agent test
60 request = Mock(user_agent='Mock')
60 request = Mock(user_agent='Mock')
@@ -62,24 +62,24 @@ class SelfIPTest(SearxTestCase):
63 search = get_search_mock(query=b'user-agent', pageno=1)
63 search = get_search_mock(query=b'user-agent', pageno=1)
64 store.call(store.plugins, 'post_search', request, search)
64 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"])
67 search = get_search_mock(query=b'user-agent', pageno=2)
67 search = get_search_mock(query=b'user-agent', pageno=2)
68 store.call(store.plugins, 'post_search', request, search)
68 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)
71 search = get_search_mock(query=b'user-agent', pageno=1)
71 search = get_search_mock(query=b'user-agent', pageno=1)
72 store.call(store.plugins, 'post_search', request, search)
72 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"])
75 search = get_search_mock(query=b'user-agent', pageno=2)
75 search = get_search_mock(query=b'user-agent', pageno=2)
76 store.call(store.plugins, 'post_search', request, search)
76 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)
79 search = get_search_mock(query=b'What is my User-Agent?', pageno=1)
79 search = get_search_mock(query=b'What is my User-Agent?', pageno=1)
80 store.call(store.plugins, 'post_search', request, search)
80 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"])
83 search = get_search_mock(query=b'What is my User-Agent?', pageno=2)
83 search = get_search_mock(query=b'What is my User-Agent?', pageno=2)
84 store.call(store.plugins, 'post_search', request, search)
84 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)