Merge branch 'master' of https://github.com/asciimoo/searx

Conflicts:
	searx/tests/test_engines.py

1 files changed, 0 insertions, 41 deletions

diff --git a/searx/tests/test_results.py b/searx/tests/test_results.py
deleted file mode 100644
index 274b5b37a..000000000
--- a/searx/tests/test_results.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from searx.results import ResultContainer
-from searx.testing import SearxTestCase
-
-
-def fake_result(url='https://aa.bb/cc?dd=ee#ff',
-                title='aaa',
-                content='bbb',
-                engine='wikipedia', **kwargs):
-    result = {'url': url,
-              'title': title,
-              'content': content,
-              'engine': engine}
-    result.update(kwargs)
-    return result
-
-
-#  TODO
-class ResultContainerTestCase(SearxTestCase):
-
-    def test_empty(self):
-        c = ResultContainer()
-        self.assertEqual(c.get_ordered_results(), [])
-
-    def test_one_result(self):
-        c = ResultContainer()
-        c.extend('wikipedia', [fake_result()])
-        self.assertEqual(c.results_length(), 1)
-
-    def test_one_suggestion(self):
-        c = ResultContainer()
-        c.extend('wikipedia', [fake_result(suggestion=True)])
-        self.assertEqual(len(c.suggestions), 1)
-        self.assertEqual(c.results_length(), 0)
-
-    def test_result_merge(self):
-        c = ResultContainer()
-        c.extend('wikipedia', [fake_result()])
-        c.extend('wikidata', [fake_result(), fake_result(url='https://example.com/')])
-        self.assertEqual(c.results_length(), 2)