diff --git a/.codecov.yml b/.codecov.yml deleted file mode 100644 index 6cdbc288529128c494647322c30223266025b3ad..0000000000000000000000000000000000000000 --- a/.codecov.yml +++ /dev/null @@ -1,31 +0,0 @@ -comment: false -coverage: - status: - project: - default: - # basic - target: auto - threshold: null - base: auto - # advanced - branches: null - if_no_uploads: error - if_not_found: success - if_ci_failed: error - only_pulls: false - flags: null - paths: null - patch: - default: - # basic - target: auto - threshold: null - base: auto - # advanced - branches: null - if_no_uploads: error - if_not_found: success - if_ci_failed: error - only_pulls: false - flags: null - paths: null diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 4f50efc408d1609e21d8790233d8909e88ce0e63..0000000000000000000000000000000000000000 --- a/.coveragerc +++ /dev/null @@ -1,20 +0,0 @@ -[run] -branch = True -source = - searx/engines - searx/__init__.py - searx/autocomplete.py - searx/https_rewrite.py - searx/languages.py - searx/search.py - searx/testing.py - searx/utils.py - searx/webapp.py - -[report] -show_missing = True -exclude_lines = - if __name__ == .__main__.: - -[html] -directory = coverage diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 29e70ddf3e65759c8af530a13940dc6e0fa77d37..96c4c67cb7f6958bceda8e6fd3ad8dfaad41f010 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,3 +27,4 @@ unittest: - ./manage.sh update_dev_packages script: - ./manage.sh unit_tests + coverage: '/TOTAL.*\s+(\d+%)$/' diff --git a/Dockerfile.env b/Dockerfile.env index 6d654297659fa8a7b7dc78d041cf7f84c235e9e3..23ab4ec191a236746422d8539696fa5a1861d065 100644 --- a/Dockerfile.env +++ b/Dockerfile.env @@ -1,8 +1,13 @@ FROM fedora +COPY requirements.txt requirements-dev.txt / + RUN dnf install -y\ wget\ python2-pip\ npm\ && dnf groupinstall -y "Development Tools" \ -&& pip3 install pytest ipdb ipython +&& pip3 install ipdb ipython \ +&& pip3 install -r /requirements.txt \ +&& pip3 install -r /requirements-dev.txt \ +&& rm -f /requirements.txt /requirements-dev.txt diff --git a/manage.sh b/manage.sh index fbbcc5cb70cfe213a66b5ca82e093856dd9ba714..4bfd69a398dfe9fc632b418a16fbdf68c0cee56f 100755 --- a/manage.sh +++ b/manage.sh @@ -26,46 +26,6 @@ update_dev_packages() { pip3 install -r "$BASE_DIR/requirements-dev.txt" } -install_geckodriver() { - echo '[!] Checking geckodriver' - # TODO : check the current geckodriver version - set -e - geckodriver -V > /dev/null 2>&1 || NOTFOUND=1 - set +e - if [ -z "$NOTFOUND" ]; then - return - fi - GECKODRIVER_VERSION="v0.19.1" - PLATFORM="`python3 -c "import platform; print(platform.system().lower(), platform.architecture()[0])"`" - case "$PLATFORM" in - "linux 32bit" | "linux2 32bit") ARCH="linux32";; - "linux 64bit" | "linux2 64bit") ARCH="linux64";; - "windows 32 bit") ARCH="win32";; - "windows 64 bit") ARCH="win64";; - "mac 64bit") ARCH="macos";; - esac - GECKODRIVER_URL="https://github.com/mozilla/geckodriver/releases/download/$GECKODRIVER_VERSION/geckodriver-$GECKODRIVER_VERSION-$ARCH.tar.gz"; - - if [ -z "$1" ]; then - if [ -z "$VIRTUAL_ENV" ]; then - printf "geckodriver can't be installed because VIRTUAL_ENV is not set, you should download it from\n %s" "$GECKODRIVER_URL" - exit - else - GECKODRIVER_DIR="$VIRTUAL_ENV/bin" - fi - else - GECKODRIVER_DIR="$1" - mkdir -p -- "$GECKODRIVER_DIR" - fi - - printf "Installing %s/geckodriver from\n %s" "$GECKODRIVER_DIR" "$GECKODRIVER_URL" - - FILE="`mktemp`" - wget -qO "$FILE" -- "$GECKODRIVER_URL" && tar xz -C "$GECKODRIVER_DIR" -f "$FILE" geckodriver - rm -- "$FILE" - chmod 777 -- "$GECKODRIVER_DIR/geckodriver" -} - locales() { pybabel compile -d "$SEARX_DIR/translations" } @@ -80,7 +40,7 @@ pep8_check() { unit_tests() { echo '[!] Running unit tests' - python3 -m nose2 -s "$BASE_DIR/tests/unit" + PYTHONPATH="$BASE_DIR" pytest --cov=searx --disable-pytest-warnings "$BASE_DIR/tests/unit" } py_test_coverage() { @@ -90,17 +50,10 @@ py_test_coverage() { && coverage html } -robot_tests() { - echo '[!] Running robot tests' - PYTHONPATH="`pwd`" python3 "$SEARX_DIR/testing.py" robot -} - tests() { set -e pep8_check unit_tests - install_geckodriver - robot_tests set +e } diff --git a/requirements-dev.txt b/requirements-dev.txt index d95ed2cc0116315425a54c3b2801cfc347963d7f..0929b0ea85f841445b3d5bb496f4114e517641da 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -1,12 +1,6 @@ babel==2.3.4 mock==2.0.0 -nose2[coverage-plugin] -cov-core==1.15.0 pep8==1.7.0 -plone.testing==5.0.0 -splinter==0.7.5 -transifex-client==0.12.2 -unittest2==1.1.0 -zope.testrunner==4.5.1 -selenium==3.5.0 mockredispy==2.9.3 +pytest==4.1.0 +pytest-cov==2.6.1 diff --git a/searx/settings_robot.yml b/searx/settings_robot.yml deleted file mode 100644 index e5f163aef19330cb479dd548cd23c14227ae9ca5..0000000000000000000000000000000000000000 --- a/searx/settings_robot.yml +++ /dev/null @@ -1,41 +0,0 @@ -general: - debug : False - instance_name : "searx_test" - -search: - safe_search : 0 - autocomplete : "" - language: "en-US" - -server: - port : 11111 - bind_address : 127.0.0.1 - secret_key : "ultrasecretkey" # change this! - base_url : False - image_proxy : False - http_protocol_version : "1.0" - -ui: - static_path : "" - templates_path : "" - default_theme : oscar - default_locale : "" - -outgoing: - request_timeout : 1.0 # seconds - useragent_suffix : "" - -engines: - - name : general dummy - engine : dummy - categories : general - shortcut : gd - - - name : dummy dummy - engine : dummy - categories : dummy - shortcut : dd - -locales: - en : English - hu : Magyar diff --git a/searx/testing.py b/searx/testing.py deleted file mode 100644 index 279ae0b7a41bbd2b703d4a1715e3ea628a6e0ea6..0000000000000000000000000000000000000000 --- a/searx/testing.py +++ /dev/null @@ -1,98 +0,0 @@ -# -*- coding: utf-8 -*- -"""Shared testing code.""" - - -import os -import subprocess -import traceback - - -from os.path import dirname, join, abspath - -from splinter import Browser -from unittest2 import TestCase - - -class SearxTestLayer: - """Base layer for non-robot tests.""" - - __name__ = 'SearxTestLayer' - - def setUp(cls): - pass - setUp = classmethod(setUp) - - def tearDown(cls): - pass - tearDown = classmethod(tearDown) - - def testSetUp(cls): - pass - testSetUp = classmethod(testSetUp) - - def testTearDown(cls): - pass - testTearDown = classmethod(testTearDown) - - -class SearxRobotLayer(): - """Searx Robot Test Layer""" - - def setUp(self): - os.setpgrp() # create new process group, become its leader - - # get program paths - webapp = os.path.join( - os.path.abspath(os.path.dirname(os.path.realpath(__file__))), - 'webapp.py' - ) - exe = 'python' - - # set robot settings path - os.environ['SEARX_SETTINGS_PATH'] = abspath( - dirname(__file__) + '/settings_robot.yml') - - # run the server - self.server = subprocess.Popen( - [exe, webapp], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT - ) - - def tearDown(self): - os.kill(self.server.pid, 9) - # remove previously set environment variable - del os.environ['SEARX_SETTINGS_PATH'] - - -# SEARXROBOTLAYER = SearxRobotLayer() -def run_robot_tests(tests): - print('Running {0} tests'.format(len(tests))) - for test in tests: - with Browser() as browser: - test(browser) - - -class SearxTestCase(TestCase): - """Base test case for non-robot tests.""" - - layer = SearxTestLayer - - -if __name__ == '__main__': - import sys - # test cases - from tests import robot - - base_dir = abspath(join(dirname(__file__), '../tests')) - if sys.argv[1] == 'robot': - test_layer = SearxRobotLayer() - errors = False - try: - test_layer.setUp() - run_robot_tests([getattr(robot, x) for x in dir(robot) if x.startswith('test_')]) - except Exception: - errors = True - print('Error occured: {0}'.format(traceback.format_exc())) - test_layer.tearDown() - sys.exit(1 if errors else 0) diff --git a/tests/__init__.py b/tests/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tests/robot/__init__.py b/tests/robot/__init__.py deleted file mode 100644 index 038a3196f2ef1b67c11d450db83f1d1601052dd7..0000000000000000000000000000000000000000 --- a/tests/robot/__init__.py +++ /dev/null @@ -1,75 +0,0 @@ -# -*- coding: utf-8 -*- - -from time import sleep - -url = "http://localhost:11111/" - - -def test_index(browser): - # Visit URL - browser.visit(url) - assert browser.is_text_present('about') - - -def test_404(browser): - # Visit URL - browser.visit(url + 'missing_link') - assert browser.is_text_present('Page not found') - - -def test_about(browser): - browser.visit(url) - browser.click_link_by_text('about') - assert browser.is_text_present('Why use searx?') - - -def test_preferences(browser): - browser.visit(url) - browser.click_link_by_text('preferences') - assert browser.is_text_present('Preferences') - assert browser.is_text_present('Cookies') - - assert browser.is_element_present_by_xpath('//label[@for="checkbox_dummy"]') - - -def test_preferences_engine_select(browser): - browser.visit(url) - browser.click_link_by_text('preferences') - - assert browser.is_element_present_by_xpath('//a[@href="#tab_engine"]') - browser.find_by_xpath('//a[@href="#tab_engine"]').first.click() - - assert not browser.find_by_xpath('//input[@id="engine_general_dummy__general"]').first.checked - browser.find_by_xpath('//label[@for="engine_general_dummy__general"]').first.check() - browser.find_by_xpath('//input[@value="save"]').first.click() - - # waiting for the redirect - without this the test is flaky.. - sleep(1) - - browser.visit(url) - browser.click_link_by_text('preferences') - browser.find_by_xpath('//a[@href="#tab_engine"]').first.click() - - assert browser.find_by_xpath('//input[@id="engine_general_dummy__general"]').first.checked - - -def test_preferences_locale(browser): - browser.visit(url) - browser.click_link_by_text('preferences') - - browser.select('locale', 'hu') - browser.find_by_xpath('//input[@value="save"]').first.click() - - # waiting for the redirect - without this the test is flaky.. - sleep(1) - - browser.visit(url) - browser.click_link_by_text('beállítások') - browser.is_text_present('Beállítások') - - -def test_search(browser): - browser.visit(url) - browser.fill('q', 'test search query') - browser.find_by_xpath('//button[@type="submit"]').first.click() - assert browser.is_text_present('didn\'t find any results') diff --git a/tests/test_robot.py b/tests/test_robot.py deleted file mode 100644 index b48153fe48404a9cb91c546e0c8d77358aeb21e1..0000000000000000000000000000000000000000 --- a/tests/test_robot.py +++ /dev/null @@ -1,23 +0,0 @@ -# -*- coding: utf-8 -*- - -import os -import unittest2 as unittest -from plone.testing import layered -from robotsuite import RobotTestSuite -from searx.testing import SEARXROBOTLAYER - - -def test_suite(): - suite = unittest.TestSuite() - current_dir = os.path.abspath(os.path.dirname(__file__)) - robot_dir = os.path.join(current_dir, 'robot') - tests = [ - os.path.join('robot', f) for f in - os.listdir(robot_dir) if f.endswith('.robot') and - f.startswith('test_') - ] - for test in tests: - suite.addTests([ - layered(RobotTestSuite(test), layer=SEARXROBOTLAYER), - ]) - return suite diff --git a/tests/unit/engines/pubmed.py b/tests/unit/engines/pubmed.py index 17f3a253f922c38041080af1857759d76be42d53..b2a657f93c1eef1cb650f87e708562d8c6ebb7b2 100644 --- a/tests/unit/engines/pubmed.py +++ b/tests/unit/engines/pubmed.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import pubmed -from searx.testing import SearxTestCase +from unittest import TestCase -class TestPubmedEngine(SearxTestCase): +class TestPubmedEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_acgsou.py b/tests/unit/engines/test_acgsou.py index fa920dcdad9a6202224025578f417a2f483c2920..57a800527aba27179b6d1f85ea7b1a1a02928c15 100644 --- a/tests/unit/engines/test_acgsou.py +++ b/tests/unit/engines/test_acgsou.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import acgsou -from searx.testing import SearxTestCase +from unittest import TestCase -class TestAcgsouEngine(SearxTestCase): +class TestAcgsouEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_archlinux.py b/tests/unit/engines/test_archlinux.py index f2ba483c13ca63e27704701236c6f56c1c16fcc2..bc1b7a07ed873f50c2b07906ac4e5724d05611be 100644 --- a/tests/unit/engines/test_archlinux.py +++ b/tests/unit/engines/test_archlinux.py @@ -1,7 +1,7 @@ from collections import defaultdict import mock from searx.engines import archlinux -from searx.testing import SearxTestCase +from unittest import TestCase domains = { 'en': 'https://wiki.archlinux.org', @@ -13,7 +13,7 @@ domains = { } -class TestArchLinuxEngine(SearxTestCase): +class TestArchLinuxEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_arxiv.py b/tests/unit/engines/test_arxiv.py index b32c0e605a758a762c771e6684a1c80c6b436ad4..0cba7641d904b47f3650055d705e605ca6342490 100644 --- a/tests/unit/engines/test_arxiv.py +++ b/tests/unit/engines/test_arxiv.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import arxiv -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBaseEngine(SearxTestCase): +class TestBaseEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_base.py b/tests/unit/engines/test_base.py index f6e7cb6c5de762036f527642f1185697380ca66e..71c560ca6b2526ac7b821d356f52c8937c3fdcf5 100644 --- a/tests/unit/engines/test_base.py +++ b/tests/unit/engines/test_base.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import base -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBaseEngine(SearxTestCase): +class TestBaseEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_bing.py b/tests/unit/engines/test_bing.py index 34989d8db0714dafcf45ca4c86dcb293f5ef2547..1fcb7382277256fd34506f5e80f1f360de2041b5 100644 --- a/tests/unit/engines/test_bing.py +++ b/tests/unit/engines/test_bing.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import bing -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBingEngine(SearxTestCase): +class TestBingEngine(TestCase): def test_request(self): bing.supported_languages = ['en', 'fr', 'zh-CHS', 'zh-CHT', 'pt-PT', 'pt-BR'] diff --git a/tests/unit/engines/test_bing_images.py b/tests/unit/engines/test_bing_images.py index cb1d550d908a6fbf52a9875339af516caa6730e3..46e35b439a68a3b1757dc413f7ba0ff8675f479e 100644 --- a/tests/unit/engines/test_bing_images.py +++ b/tests/unit/engines/test_bing_images.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import bing_images -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBingImagesEngine(SearxTestCase): +class TestBingImagesEngine(TestCase): def test_request(self): bing_images.supported_languages = ['fr-FR', 'en-US'] diff --git a/tests/unit/engines/test_bing_news.py b/tests/unit/engines/test_bing_news.py index e5f80c00bc9541798fca74f6ef180f87df8a73d2..a02e75e5eb5cbbf82133511b508df8b304b7364d 100644 --- a/tests/unit/engines/test_bing_news.py +++ b/tests/unit/engines/test_bing_news.py @@ -1,11 +1,11 @@ from collections import defaultdict import mock from searx.engines import bing_news -from searx.testing import SearxTestCase +from unittest import TestCase import lxml -class TestBingNewsEngine(SearxTestCase): +class TestBingNewsEngine(TestCase): def test_request(self): bing_news.supported_languages = ['en', 'fr'] diff --git a/tests/unit/engines/test_bing_videos.py b/tests/unit/engines/test_bing_videos.py index 24387c888502c666bcea830147429beb09231b75..cd5d3a3afb3e946c3218408c0c2899d9df08f083 100644 --- a/tests/unit/engines/test_bing_videos.py +++ b/tests/unit/engines/test_bing_videos.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import bing_videos -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBingVideosEngine(SearxTestCase): +class TestBingVideosEngine(TestCase): def test_request(self): bing_videos.supported_languages = ['fr-FR', 'en-US'] diff --git a/tests/unit/engines/test_btdigg.py b/tests/unit/engines/test_btdigg.py index 4947b71da40946c54169fba2bab040949ac1094d..876388f0fa532dbe335322eb285264d467a226dc 100644 --- a/tests/unit/engines/test_btdigg.py +++ b/tests/unit/engines/test_btdigg.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import btdigg -from searx.testing import SearxTestCase +from unittest import TestCase -class TestBtdiggEngine(SearxTestCase): +class TestBtdiggEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_currency_convert.py b/tests/unit/engines/test_currency_convert.py index e066fde0849057ee5e1599ab8578c180f5db9f2d..dee74511027832beb1db2822353ed6ab0345dae4 100644 --- a/tests/unit/engines/test_currency_convert.py +++ b/tests/unit/engines/test_currency_convert.py @@ -2,10 +2,10 @@ from collections import defaultdict from datetime import datetime import mock from searx.engines import currency_convert -from searx.testing import SearxTestCase +from unittest import TestCase -class TestCurrencyConvertEngine(SearxTestCase): +class TestCurrencyConvertEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_dailymotion.py b/tests/unit/engines/test_dailymotion.py index 63659490e487f1b30a82048e7f10ba6c29a903b5..9a5a17757dd3f95e7fd6cd0e73567da1e214f5ee 100644 --- a/tests/unit/engines/test_dailymotion.py +++ b/tests/unit/engines/test_dailymotion.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import dailymotion -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDailymotionEngine(SearxTestCase): +class TestDailymotionEngine(TestCase): def test_request(self): dailymotion.supported_languages = ['en', 'fr'] diff --git a/tests/unit/engines/test_deezer.py b/tests/unit/engines/test_deezer.py index 5b9f55c331d8f665ce6471f78f3b8b5cad3b00f0..aaa1af90710385162de4234a858071510f51e615 100644 --- a/tests/unit/engines/test_deezer.py +++ b/tests/unit/engines/test_deezer.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import deezer -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDeezerEngine(SearxTestCase): +class TestDeezerEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_deviantart.py b/tests/unit/engines/test_deviantart.py index bd2cf182f861ddf1ba750c1b1797d5448321a3ac..729718512e5a47eeaebe8c0a97384dca41af2401 100644 --- a/tests/unit/engines/test_deviantart.py +++ b/tests/unit/engines/test_deviantart.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import deviantart -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDeviantartEngine(SearxTestCase): +class TestDeviantartEngine(TestCase): def test_request(self): dicto = defaultdict(dict) diff --git a/tests/unit/engines/test_digbt.py b/tests/unit/engines/test_digbt.py index 3fec6773d48ec51489c083c8f2da7d087de1919a..88401b6ede70264708f11f4c6efc34217dffbf25 100644 --- a/tests/unit/engines/test_digbt.py +++ b/tests/unit/engines/test_digbt.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import digbt -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDigBTEngine(SearxTestCase): +class TestDigBTEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_digg.py b/tests/unit/engines/test_digg.py index 6e7c9cc991e662f1066a42e3c09696d36d933761..2ce61a019b5d1d796215ab41deb8a1df5aa0961c 100644 --- a/tests/unit/engines/test_digg.py +++ b/tests/unit/engines/test_digg.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import digg -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDiggEngine(SearxTestCase): +class TestDiggEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_doku.py b/tests/unit/engines/test_doku.py index 115bdd8e0a61bf83145a34f91c651e56b645140b..af5b4802fbd8cb100a0f7cfed3dff7679a84ba6c 100644 --- a/tests/unit/engines/test_doku.py +++ b/tests/unit/engines/test_doku.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import doku -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDokuEngine(SearxTestCase): +class TestDokuEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_duckduckgo.py b/tests/unit/engines/test_duckduckgo.py index c39bc1bf33d76d4a483b1d71eed25e5a4480da8a..03ad258d4e593ac79fcf2b0518dcfb980f030146 100644 --- a/tests/unit/engines/test_duckduckgo.py +++ b/tests/unit/engines/test_duckduckgo.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import load_engine, duckduckgo -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDuckduckgoEngine(SearxTestCase): +class TestDuckduckgoEngine(TestCase): def test_request(self): duckduckgo = load_engine({'engine': 'duckduckgo', 'name': 'duckduckgo'}) diff --git a/tests/unit/engines/test_duckduckgo_definitions.py b/tests/unit/engines/test_duckduckgo_definitions.py index 37587ed8dd6d3643542e18b2c584817b6560f9c0..2c432a5b8d052ebbf56ee18e7ac5c18d420ff977 100644 --- a/tests/unit/engines/test_duckduckgo_definitions.py +++ b/tests/unit/engines/test_duckduckgo_definitions.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import duckduckgo_definitions -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDDGDefinitionsEngine(SearxTestCase): +class TestDDGDefinitionsEngine(TestCase): def test_result_to_text(self): url = '' diff --git a/tests/unit/engines/test_duckduckgo_images.py b/tests/unit/engines/test_duckduckgo_images.py index 35bb029f45e83b983d9953575eb2db113ebf1d31..f77b27c7c960ed00dff0815c89b189129a1283c0 100644 --- a/tests/unit/engines/test_duckduckgo_images.py +++ b/tests/unit/engines/test_duckduckgo_images.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import duckduckgo_images -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDuckduckgoImagesEngine(SearxTestCase): +class TestDuckduckgoImagesEngine(TestCase): def test_request(self): duckduckgo_images.supported_languages = ['de-CH', 'en-US'] diff --git a/tests/unit/engines/test_duden.py b/tests/unit/engines/test_duden.py index d9bbfef8b7cd228ce1bb9a3a26be1b84d9f80dab..44cd17014b59ba8a04020e6f58d41ef5dc25eef1 100644 --- a/tests/unit/engines/test_duden.py +++ b/tests/unit/engines/test_duden.py @@ -1,11 +1,11 @@ from collections import defaultdict import mock from searx.engines import duden -from searx.testing import SearxTestCase +from unittest import TestCase from datetime import datetime -class TestDudenEngine(SearxTestCase): +class TestDudenEngine(TestCase): def test_request(self): query = 'Haus' diff --git a/tests/unit/engines/test_dummy.py b/tests/unit/engines/test_dummy.py index 9399beaaf70ed31136ef2f4384a9cecf2cd9b6ec..7fe1d0a4e4b5744ecf26e74022b5b3cb78c7bc9a 100644 --- a/tests/unit/engines/test_dummy.py +++ b/tests/unit/engines/test_dummy.py @@ -1,8 +1,8 @@ from searx.engines import dummy -from searx.testing import SearxTestCase +from unittest import TestCase -class TestDummyEngine(SearxTestCase): +class TestDummyEngine(TestCase): def test_request(self): test_params = [ diff --git a/tests/unit/engines/test_faroo.py b/tests/unit/engines/test_faroo.py index 0cc8bc3e0f157efaee070c44ed019c8b8653199b..750c32a74198d6d3bbd7dc72af4beda74f036407 100644 --- a/tests/unit/engines/test_faroo.py +++ b/tests/unit/engines/test_faroo.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import faroo -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFarooEngine(SearxTestCase): +class TestFarooEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_fdroid.py b/tests/unit/engines/test_fdroid.py index d75f4f0b48053c45efc32f5d3033ea7db71709bd..f7ca46297ba99c329a03ec18da720f140f9e2cf6 100644 --- a/tests/unit/engines/test_fdroid.py +++ b/tests/unit/engines/test_fdroid.py @@ -1,10 +1,10 @@ import mock from collections import defaultdict from searx.engines import fdroid -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFdroidEngine(SearxTestCase): +class TestFdroidEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_flickr.py b/tests/unit/engines/test_flickr.py index be97647ce7834a2b31b03c578f801622f61628d6..12fcbc248518ac61026fd195e1542614349db03c 100644 --- a/tests/unit/engines/test_flickr.py +++ b/tests/unit/engines/test_flickr.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import flickr -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFlickrEngine(SearxTestCase): +class TestFlickrEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_flickr_noapi.py b/tests/unit/engines/test_flickr_noapi.py index 5f8b069e3faacf6169986e43698dc84dcd40dd4d..3fa4e7eba6fb1f3aaab1c72a861104aff596d87a 100644 --- a/tests/unit/engines/test_flickr_noapi.py +++ b/tests/unit/engines/test_flickr_noapi.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import flickr_noapi -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFlickrNoapiEngine(SearxTestCase): +class TestFlickrNoapiEngine(TestCase): def test_build_flickr_url(self): url = flickr_noapi.build_flickr_url("uid", "pid") diff --git a/tests/unit/engines/test_framalibre.py b/tests/unit/engines/test_framalibre.py index f0d0a9ebbf51f5158f7009c78f34cf1684fb4baa..fe8402c5429ba7cac08fc42850ef2541edfb7799 100644 --- a/tests/unit/engines/test_framalibre.py +++ b/tests/unit/engines/test_framalibre.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import framalibre -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFramalibreEngine(SearxTestCase): +class TestFramalibreEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_frinkiac.py b/tests/unit/engines/test_frinkiac.py index 49344cad16d5b24d037061beb8860d91f54c9ec1..97fe1f72e7d29de96aa30807b392d50c131343b4 100644 --- a/tests/unit/engines/test_frinkiac.py +++ b/tests/unit/engines/test_frinkiac.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import frinkiac -from searx.testing import SearxTestCase +from unittest import TestCase -class TestFrinkiacEngine(SearxTestCase): +class TestFrinkiacEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_genius.py b/tests/unit/engines/test_genius.py index ea721943a1b08f1cfeff1159893ebbdd7c6b4dde..31c33e47f2fc03b103a3ab344d9ceea210705790 100644 --- a/tests/unit/engines/test_genius.py +++ b/tests/unit/engines/test_genius.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from datetime import datetime from searx.engines import genius -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGeniusEngine(SearxTestCase): +class TestGeniusEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_gigablast.py b/tests/unit/engines/test_gigablast.py index f0ddb63bcd88979a38cb358734b0c40c59ab205d..aef18daadaf51ead7199e09bd286ca7c815aa727 100644 --- a/tests/unit/engines/test_gigablast.py +++ b/tests/unit/engines/test_gigablast.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import gigablast -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGigablastEngine(SearxTestCase): +class TestGigablastEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_github.py b/tests/unit/engines/test_github.py index 460be8c3df89f3da38e9491d42c440a111eafde9..6983ca9b7aaedb6822d9159903840217f0db60eb 100644 --- a/tests/unit/engines/test_github.py +++ b/tests/unit/engines/test_github.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import github -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGitHubEngine(SearxTestCase): +class TestGitHubEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_google.py b/tests/unit/engines/test_google.py index 3c4e2837f080505a4493ebdd0799935979e1c3ac..749e1f0bc7d3e3c88acfa6d9f3a2aee7c88eb1fd 100644 --- a/tests/unit/engines/test_google.py +++ b/tests/unit/engines/test_google.py @@ -3,10 +3,10 @@ from collections import defaultdict import mock import lxml from searx.engines import google -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGoogleEngine(SearxTestCase): +class TestGoogleEngine(TestCase): def mock_response(self, text): response = mock.Mock(text=text, url='https://www.google.com/search?q=test&start=0&gbv=1&gws_rd=cr') diff --git a/tests/unit/engines/test_google_images.py b/tests/unit/engines/test_google_images.py index 8366e1b0883d93c4bcd6547af3b1d6cb609eae8c..7a1fcb9febcfca0c5ed878fc189a7cbb4636ad00 100644 --- a/tests/unit/engines/test_google_images.py +++ b/tests/unit/engines/test_google_images.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import google_images -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGoogleImagesEngine(SearxTestCase): +class TestGoogleImagesEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_google_news.py b/tests/unit/engines/test_google_news.py index f6eaff76a5dc013ef89161af6264b68982c85c00..db85d61c3ddd12adc6f0d5bf57640d954b91e463 100644 --- a/tests/unit/engines/test_google_news.py +++ b/tests/unit/engines/test_google_news.py @@ -3,10 +3,10 @@ from collections import defaultdict import mock from searx.engines import google_news -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGoogleNewsEngine(SearxTestCase): +class TestGoogleNewsEngine(TestCase): def test_request(self): google_news.supported_languages = ['en-US', 'fr-FR'] diff --git a/tests/unit/engines/test_google_videos.py b/tests/unit/engines/test_google_videos.py index cdc6fcd4225dc62f6887c260020691de329a519c..fcb3893fb980f9d794bc75547f09888331e88baf 100644 --- a/tests/unit/engines/test_google_videos.py +++ b/tests/unit/engines/test_google_videos.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import google_videos -from searx.testing import SearxTestCase +from unittest import TestCase -class TestGoogleVideosEngine(SearxTestCase): +class TestGoogleVideosEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_ina.py b/tests/unit/engines/test_ina.py index 521a6ff8780ff1759c21d740944fa2881b2b158e..074dd0e9cdac0b7fe90162c58274cf879fea515b 100644 --- a/tests/unit/engines/test_ina.py +++ b/tests/unit/engines/test_ina.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import ina -from searx.testing import SearxTestCase +from unittest import TestCase -class TestInaEngine(SearxTestCase): +class TestInaEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_kickass.py b/tests/unit/engines/test_kickass.py index 3a75c66974ebc8855998e95aa7e27ee575a6cab1..ba2239a139144fb0a24c899716f47852bee45052 100644 --- a/tests/unit/engines/test_kickass.py +++ b/tests/unit/engines/test_kickass.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import kickass -from searx.testing import SearxTestCase +from unittest import TestCase -class TestKickassEngine(SearxTestCase): +class TestKickassEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_mediawiki.py b/tests/unit/engines/test_mediawiki.py index 1fc43dea32eb5220e99a772874dc68860021fe9e..c8c6a8eb6d7d09361b7645378c843c98a79eca44 100644 --- a/tests/unit/engines/test_mediawiki.py +++ b/tests/unit/engines/test_mediawiki.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import mediawiki -from searx.testing import SearxTestCase +from unittest import TestCase -class TestMediawikiEngine(SearxTestCase): +class TestMediawikiEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_mixcloud.py b/tests/unit/engines/test_mixcloud.py index 9c79a478e2537573de057c11301890b66c8d7f4e..ccde14dc0bcd5974c7e77d1caa05e1174e48963b 100644 --- a/tests/unit/engines/test_mixcloud.py +++ b/tests/unit/engines/test_mixcloud.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import mixcloud -from searx.testing import SearxTestCase +from unittest import TestCase -class TestMixcloudEngine(SearxTestCase): +class TestMixcloudEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_nyaa.py b/tests/unit/engines/test_nyaa.py index 6dcafc6b712226387f2dce677c7075108bef279e..a017d9621aaea44f6aad50ed7303a0d512e5d8f5 100644 --- a/tests/unit/engines/test_nyaa.py +++ b/tests/unit/engines/test_nyaa.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import nyaa -from searx.testing import SearxTestCase +from unittest import TestCase -class TestNyaaEngine(SearxTestCase): +class TestNyaaEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_openstreetmap.py b/tests/unit/engines/test_openstreetmap.py index 7b7783f040fa3527aeecc18db7f7eac4a961911b..f85fabe326629f95b928e98c031ff905e5a9b54d 100644 --- a/tests/unit/engines/test_openstreetmap.py +++ b/tests/unit/engines/test_openstreetmap.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import openstreetmap -from searx.testing import SearxTestCase +from unittest import TestCase -class TestOpenstreetmapEngine(SearxTestCase): +class TestOpenstreetmapEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_pdbe.py b/tests/unit/engines/test_pdbe.py index ea5adf9dcf211444757f3d37a2f7890b7c81fc5e..6558a9245ebe4aea0e575dfb780bd152875ff5b5 100644 --- a/tests/unit/engines/test_pdbe.py +++ b/tests/unit/engines/test_pdbe.py @@ -1,10 +1,10 @@ import mock from collections import defaultdict from searx.engines import pdbe -from searx.testing import SearxTestCase +from unittest import TestCase -class TestPdbeEngine(SearxTestCase): +class TestPdbeEngine(TestCase): def test_request(self): query = 'test_query' dicto = defaultdict(dict) diff --git a/tests/unit/engines/test_photon.py b/tests/unit/engines/test_photon.py index 002000d50795e88ce7b9deb0c1de5a4862874cc8..f86b1c4801fdc08cc008e6c5f18e98c27fb2482d 100644 --- a/tests/unit/engines/test_photon.py +++ b/tests/unit/engines/test_photon.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import photon -from searx.testing import SearxTestCase +from unittest import TestCase -class TestPhotonEngine(SearxTestCase): +class TestPhotonEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_piratebay.py b/tests/unit/engines/test_piratebay.py index 89a78e79653fba5632543c5572cadfdc8f1c10d9..1d985f9cc901da29795e5b969b32a856a2d9672d 100644 --- a/tests/unit/engines/test_piratebay.py +++ b/tests/unit/engines/test_piratebay.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import piratebay -from searx.testing import SearxTestCase +from unittest import TestCase -class TestPiratebayEngine(SearxTestCase): +class TestPiratebayEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_qwant.py b/tests/unit/engines/test_qwant.py index 86bfb22dafdab5f77069c12b8b8d44ccdb2d6091..c458f1f0a57f65d57acbb36501e6d5dbc8c4266c 100644 --- a/tests/unit/engines/test_qwant.py +++ b/tests/unit/engines/test_qwant.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import qwant -from searx.testing import SearxTestCase +from unittest import TestCase -class TestQwantEngine(SearxTestCase): +class TestQwantEngine(TestCase): def test_request(self): qwant.supported_languages = ['en-US', 'fr-CA', 'fr-FR'] diff --git a/tests/unit/engines/test_reddit.py b/tests/unit/engines/test_reddit.py index 9c94f4e2b70343b33415857952fbbb474cb1a632..53e25f5ee8c0f70d826f6d1aeae6fea55953bf81 100644 --- a/tests/unit/engines/test_reddit.py +++ b/tests/unit/engines/test_reddit.py @@ -1,11 +1,11 @@ from collections import defaultdict import mock from searx.engines import reddit -from searx.testing import SearxTestCase +from unittest import TestCase from datetime import datetime -class TestRedditEngine(SearxTestCase): +class TestRedditEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_scanr_structures.py b/tests/unit/engines/test_scanr_structures.py index 2e8c097b3bd2c6e83a86d434c0d2c2bfbef6af3d..04e442a16e9a7247ed7710082cd7c101bf89e449 100644 --- a/tests/unit/engines/test_scanr_structures.py +++ b/tests/unit/engines/test_scanr_structures.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import scanr_structures -from searx.testing import SearxTestCase +from unittest import TestCase -class TestScanrStructuresEngine(SearxTestCase): +class TestScanrStructuresEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_searchcode_code.py b/tests/unit/engines/test_searchcode_code.py index 955aea111e3df2bf2cd0f2222cab9c18d1d2206c..911c0dd2274a6cb2ab41f697a0976424716639bd 100644 --- a/tests/unit/engines/test_searchcode_code.py +++ b/tests/unit/engines/test_searchcode_code.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import searchcode_code -from searx.testing import SearxTestCase +from unittest import TestCase -class TestSearchcodeCodeEngine(SearxTestCase): +class TestSearchcodeCodeEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_searchcode_doc.py b/tests/unit/engines/test_searchcode_doc.py index d02bb7a441b1127df6e7442d0eae6cfa004f3542..cda9fd4afe30f05599e2bf940948e1963bb84589 100644 --- a/tests/unit/engines/test_searchcode_doc.py +++ b/tests/unit/engines/test_searchcode_doc.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import searchcode_doc -from searx.testing import SearxTestCase +from unittest import TestCase -class TestSearchcodeDocEngine(SearxTestCase): +class TestSearchcodeDocEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_seedpeer.py b/tests/unit/engines/test_seedpeer.py index 37b2de8e4d9e7782da9a2273e8c137f1879b8935..486ecad7acbafdfbd93074765c7a6edb1098b42e 100644 --- a/tests/unit/engines/test_seedpeer.py +++ b/tests/unit/engines/test_seedpeer.py @@ -1,11 +1,11 @@ import mock from collections import defaultdict from searx.engines import seedpeer -from searx.testing import SearxTestCase +from unittest import TestCase from datetime import datetime -class TestSeedPeerEngine(SearxTestCase): +class TestSeedPeerEngine(TestCase): html = '' with open('./tests/unit/engines/seedpeer_fixture.html') as fixture: diff --git a/tests/unit/engines/test_soundcloud.py b/tests/unit/engines/test_soundcloud.py index 3077d3b4b4dc3d8b18fbbeacba932636ad1b1e6e..bf06965badb0c06b03b8c341083d3acb3f5ec679 100644 --- a/tests/unit/engines/test_soundcloud.py +++ b/tests/unit/engines/test_soundcloud.py @@ -1,11 +1,11 @@ from collections import defaultdict import mock from searx.engines import soundcloud -from searx.testing import SearxTestCase +from unittest import TestCase from searx.url_utils import quote_plus -class TestSoundcloudEngine(SearxTestCase): +class TestSoundcloudEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_spotify.py b/tests/unit/engines/test_spotify.py index e37c344d2154df6809b86b472b0c3f22c47eea5c..aaed5176374f7aa206505e39ee2cd78725e9b942 100644 --- a/tests/unit/engines/test_spotify.py +++ b/tests/unit/engines/test_spotify.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import spotify -from searx.testing import SearxTestCase +from unittest import TestCase -class TestSpotifyEngine(SearxTestCase): +class TestSpotifyEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_stackoverflow.py b/tests/unit/engines/test_stackoverflow.py index 18a1ff4bdb9e9df92e8b243658c149a15d84ac11..f71920bc55f7d9316216d076105b2ab5f694bd98 100644 --- a/tests/unit/engines/test_stackoverflow.py +++ b/tests/unit/engines/test_stackoverflow.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import stackoverflow -from searx.testing import SearxTestCase +from unittest import TestCase -class TestStackoverflowEngine(SearxTestCase): +class TestStackoverflowEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_startpage.py b/tests/unit/engines/test_startpage.py index f3571a5f4dffa21e7921692dc7068a453d0c8bdf..9b23bac1fd0130a5e3e3cc2f14a92a62278150fb 100644 --- a/tests/unit/engines/test_startpage.py +++ b/tests/unit/engines/test_startpage.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import startpage -from searx.testing import SearxTestCase +from unittest import TestCase -class TestStartpageEngine(SearxTestCase): +class TestStartpageEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_subtitleseeker.py b/tests/unit/engines/test_subtitleseeker.py index 96b253943d63f4ba3f3c0ff968eda06f3c876719..eeeabc49a38ac3fb1ea30930b52050443bdc6644 100644 --- a/tests/unit/engines/test_subtitleseeker.py +++ b/tests/unit/engines/test_subtitleseeker.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import subtitleseeker -from searx.testing import SearxTestCase +from unittest import TestCase -class TestSubtitleseekerEngine(SearxTestCase): +class TestSubtitleseekerEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_swisscows.py b/tests/unit/engines/test_swisscows.py index 8fa5956637d05a30d716111d0de7b2778008a6ad..b3a65603eb6f137ba001ca94f0ba53158e917150 100644 --- a/tests/unit/engines/test_swisscows.py +++ b/tests/unit/engines/test_swisscows.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import swisscows -from searx.testing import SearxTestCase +from unittest import TestCase -class TestSwisscowsEngine(SearxTestCase): +class TestSwisscowsEngine(TestCase): def test_request(self): swisscows.supported_languages = ['de-AT', 'de-DE'] diff --git a/tests/unit/engines/test_tokyotoshokan.py b/tests/unit/engines/test_tokyotoshokan.py index b5c6fad17b25b358cf8592e0856a90b737db5977..991b43ea215f4d77c62baf4ea54bebe76fcaad0d 100644 --- a/tests/unit/engines/test_tokyotoshokan.py +++ b/tests/unit/engines/test_tokyotoshokan.py @@ -1,11 +1,11 @@ import mock from collections import defaultdict from searx.engines import tokyotoshokan -from searx.testing import SearxTestCase +from unittest import TestCase from datetime import datetime -class TestTokyotoshokanEngine(SearxTestCase): +class TestTokyotoshokanEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_torrentz.py b/tests/unit/engines/test_torrentz.py index f483bf68cc2175ff0387228235c55c69f4447935..35256a81310b599267f08d4fac458cdbdc275ada 100644 --- a/tests/unit/engines/test_torrentz.py +++ b/tests/unit/engines/test_torrentz.py @@ -1,11 +1,11 @@ import mock from collections import defaultdict from searx.engines import torrentz -from searx.testing import SearxTestCase +from unittest import TestCase from datetime import datetime -class TestTorrentzEngine(SearxTestCase): +class TestTorrentzEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_twitter.py b/tests/unit/engines/test_twitter.py index b3818714f36371afce6fdc0dfeac14390be27ab2..88baa1df41bada9165637e13d812ff7f8be662f8 100644 --- a/tests/unit/engines/test_twitter.py +++ b/tests/unit/engines/test_twitter.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import twitter -from searx.testing import SearxTestCase +from unittest import TestCase -class TestTwitterEngine(SearxTestCase): +class TestTwitterEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_vimeo.py b/tests/unit/engines/test_vimeo.py index 549ea114cde1767128af0549ec8d010890c7cc13..ac492094afdfca49684110a221b42319e06d3ef4 100644 --- a/tests/unit/engines/test_vimeo.py +++ b/tests/unit/engines/test_vimeo.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import vimeo -from searx.testing import SearxTestCase +from unittest import TestCase -class TestVimeoEngine(SearxTestCase): +class TestVimeoEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_wikidata.py b/tests/unit/engines/test_wikidata.py index bcceb5e54e0216a554816cd79df66b10b42cfed9..a8ef7094a192ce59db0e97e9c28151cc7f8cb77e 100644 --- a/tests/unit/engines/test_wikidata.py +++ b/tests/unit/engines/test_wikidata.py @@ -3,10 +3,10 @@ from lxml.html import fromstring from collections import defaultdict import mock from searx.engines import wikidata -from searx.testing import SearxTestCase +from unittest import TestCase -class TestWikidataEngine(SearxTestCase): +class TestWikidataEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_wikipedia.py b/tests/unit/engines/test_wikipedia.py index f720d6afc11fd3fa2b95b460920a5b4647762a1b..0b79975a9d4a4380a5145ee0111817be8ec30b6b 100644 --- a/tests/unit/engines/test_wikipedia.py +++ b/tests/unit/engines/test_wikipedia.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import wikipedia -from searx.testing import SearxTestCase +from unittest import TestCase -class TestWikipediaEngine(SearxTestCase): +class TestWikipediaEngine(TestCase): def test_request(self): wikipedia.supported_languages = ['fr', 'en'] diff --git a/tests/unit/engines/test_wolframalpha_api.py b/tests/unit/engines/test_wolframalpha_api.py index 3f3f93a4f30cbdcfd784f4a08a78b29ee42d96a3..586f9061fca2a1aeca3e6840ce38abb17d75d6ba 100644 --- a/tests/unit/engines/test_wolframalpha_api.py +++ b/tests/unit/engines/test_wolframalpha_api.py @@ -3,10 +3,10 @@ from collections import defaultdict import mock from requests import Request from searx.engines import wolframalpha_api -from searx.testing import SearxTestCase +from unittest import TestCase -class TestWolframAlphaAPIEngine(SearxTestCase): +class TestWolframAlphaAPIEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_wolframalpha_noapi.py b/tests/unit/engines/test_wolframalpha_noapi.py index 982edd9f2fb0f942da8d7214ca33dec38061925e..d60ed0625642a3c4171b09f511272a281f384044 100644 --- a/tests/unit/engines/test_wolframalpha_noapi.py +++ b/tests/unit/engines/test_wolframalpha_noapi.py @@ -3,10 +3,10 @@ from collections import defaultdict import mock from requests import Request from searx.engines import wolframalpha_noapi -from searx.testing import SearxTestCase +from unittest import TestCase -class TestWolframAlphaNoAPIEngine(SearxTestCase): +class TestWolframAlphaNoAPIEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_www1x.py b/tests/unit/engines/test_www1x.py index 9df8de6bf5906ae1debc78fc91b97aaa490dc4ab..67081a3a592cf4b0dd96451657ca87897e01b709 100644 --- a/tests/unit/engines/test_www1x.py +++ b/tests/unit/engines/test_www1x.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import www1x -from searx.testing import SearxTestCase +from unittest import TestCase -class TestWww1xEngine(SearxTestCase): +class TestWww1xEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_yacy.py b/tests/unit/engines/test_yacy.py index a60614d3d83f77e572c9ae853171141d7e077a81..922ab8a636286a43db850b96cb5ef90c663dea22 100644 --- a/tests/unit/engines/test_yacy.py +++ b/tests/unit/engines/test_yacy.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import yacy -from searx.testing import SearxTestCase +from unittest import TestCase -class TestYacyEngine(SearxTestCase): +class TestYacyEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_yahoo.py b/tests/unit/engines/test_yahoo.py index 5037bfc7d7af77c57f750399ed485b2088601fea..479d5599ccf80250ec30583d9b3971f3739a9d95 100644 --- a/tests/unit/engines/test_yahoo.py +++ b/tests/unit/engines/test_yahoo.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import yahoo -from searx.testing import SearxTestCase +from unittest import TestCase -class TestYahooEngine(SearxTestCase): +class TestYahooEngine(TestCase): def test_parse_url(self): test_url = 'http://r.search.yahoo.com/_ylt=A0LEb9JUSKcAEGRXNyoA;_ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb' +\ diff --git a/tests/unit/engines/test_yahoo_news.py b/tests/unit/engines/test_yahoo_news.py index c3297dacf94a38ab5f4a149ec84e93ea82bf2cba..9cb7a6fc25d7d6b4158b169e0c8bebb7b4515b2f 100644 --- a/tests/unit/engines/test_yahoo_news.py +++ b/tests/unit/engines/test_yahoo_news.py @@ -3,10 +3,10 @@ from collections import defaultdict from datetime import datetime import mock from searx.engines import yahoo_news -from searx.testing import SearxTestCase +from unittest import TestCase -class TestYahooNewsEngine(SearxTestCase): +class TestYahooNewsEngine(TestCase): def test_request(self): yahoo_news.supported_languages = ['en', 'fr'] diff --git a/tests/unit/engines/test_youtube_api.py b/tests/unit/engines/test_youtube_api.py index 0d4d478c3bbb9d46e977c688ed1f48aaa5428440..789d8b1943391b0a7bf1a759087247d7e0076227 100644 --- a/tests/unit/engines/test_youtube_api.py +++ b/tests/unit/engines/test_youtube_api.py @@ -1,10 +1,10 @@ from collections import defaultdict import mock from searx.engines import youtube_api -from searx.testing import SearxTestCase +from unittest import TestCase -class TestYoutubeAPIEngine(SearxTestCase): +class TestYoutubeAPIEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/engines/test_youtube_noapi.py b/tests/unit/engines/test_youtube_noapi.py index 41dcbb7492b088c9715a77f357f51c8526b5e363..f102936ff0739074f96e1d87503c17975f7f1604 100644 --- a/tests/unit/engines/test_youtube_noapi.py +++ b/tests/unit/engines/test_youtube_noapi.py @@ -2,10 +2,10 @@ from collections import defaultdict import mock from searx.engines import youtube_noapi -from searx.testing import SearxTestCase +from unittest import TestCase -class TestYoutubeNoAPIEngine(SearxTestCase): +class TestYoutubeNoAPIEngine(TestCase): def test_request(self): query = 'test_query' diff --git a/tests/unit/test_answerers.py b/tests/unit/test_answerers.py index 73d8d26f2ff4f65e71b9fc6b939e57f26bc82009..756edc37d95f7c131a04ae00f03951de1a057f3d 100644 --- a/tests/unit/test_answerers.py +++ b/tests/unit/test_answerers.py @@ -3,10 +3,10 @@ from mock import Mock from searx.answerers import answerers -from searx.testing import SearxTestCase +from unittest import TestCase -class AnswererTest(SearxTestCase): +class AnswererTest(TestCase): def test_unicode_input(self): query = Mock() diff --git a/tests/unit/test_plugins.py b/tests/unit/test_plugins.py index 5b2ec48b47604801128b2579617e287a8ec509ba..729b8fc912408257f69ebfe110332f7e5a63c00f 100644 --- a/tests/unit/test_plugins.py +++ b/tests/unit/test_plugins.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from searx.testing import SearxTestCase +from unittest import TestCase from searx import plugins from mock import Mock @@ -9,7 +9,7 @@ def get_search_mock(query, **kwargs): return Mock(query=query, answers=set(), **kwargs) -class PluginStoreTest(SearxTestCase): +class PluginStoreTest(TestCase): def test_PluginStore_init(self): store = plugins.PluginStore() @@ -36,7 +36,7 @@ class PluginStoreTest(SearxTestCase): self.assertTrue(testplugin.asdf.called) -class SelfIPTest(SearxTestCase): +class SelfIPTest(TestCase): def test_PluginStore_init(self): store = plugins.PluginStore() diff --git a/tests/unit/test_preferences.py b/tests/unit/test_preferences.py index 07ca61f099773a01261c9a2b29101abd4bfed8a0..6fcd0cee4e9731d4fdf3ed5414e2705cd4357594 100644 --- a/tests/unit/test_preferences.py +++ b/tests/unit/test_preferences.py @@ -1,6 +1,6 @@ from searx.preferences import (EnumStringSetting, MapSetting, MissingArgumentException, SearchLanguageSetting, MultipleChoiceSetting, PluginsSetting, ValidationException) -from searx.testing import SearxTestCase +from unittest import TestCase class PluginStub(object): @@ -10,7 +10,7 @@ class PluginStub(object): self.default_on = default_on -class TestSettings(SearxTestCase): +class TestSettings(TestCase): # map settings def test_map_setting_invalid_initialization(self): diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py index 1006434cf5cfaf0558d0318df174f33642a319fd..7c575572615804bb5f961e2869079ec462b4c0fc 100644 --- a/tests/unit/test_query.py +++ b/tests/unit/test_query.py @@ -1,8 +1,8 @@ from searx.query import RawTextQuery -from searx.testing import SearxTestCase +from unittest import TestCase -class TestQuery(SearxTestCase): +class TestQuery(TestCase): def test_simple_query(self): query_text = 'the query' diff --git a/tests/unit/test_results.py b/tests/unit/test_results.py index 274b5b37af81a208bd39f769d4912b5913f18761..b659daafac213fe0f8075794c104263e93e2c18f 100644 --- a/tests/unit/test_results.py +++ b/tests/unit/test_results.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from searx.results import ResultContainer -from searx.testing import SearxTestCase +from unittest import TestCase def fake_result(url='https://aa.bb/cc?dd=ee#ff', @@ -17,7 +17,7 @@ def fake_result(url='https://aa.bb/cc?dd=ee#ff', # TODO -class ResultContainerTestCase(SearxTestCase): +class ResultContainerTestCase(TestCase): def test_empty(self): c = ResultContainer() diff --git a/tests/unit/test_search.py b/tests/unit/test_search.py index af5fffd8b3a501a90842c8caa67d27a204c5fcd4..62c46f8ad8530ca24872911cc9dbd59eff3e4a55 100644 --- a/tests/unit/test_search.py +++ b/tests/unit/test_search.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- -from searx.testing import SearxTestCase +from unittest import TestCase # TODO -class SearchTestCase(SearxTestCase): +class SearchTestCase(TestCase): def test_(self): pass diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py index 75a855c6b9a10b43bc3a6c1302dbb9b8e54843b6..211cd0bc298b3dde05fbf2f510b4ed9297c2066c 100644 --- a/tests/unit/test_utils.py +++ b/tests/unit/test_utils.py @@ -1,10 +1,10 @@ # -*- coding: utf-8 -*- import mock -from searx.testing import SearxTestCase +from unittest import TestCase from searx import utils -class TestUtils(SearxTestCase): +class TestUtils(TestCase): def test_gen_useragent(self): self.assertIsInstance(utils.gen_useragent(), str) @@ -87,7 +87,7 @@ class TestUtils(SearxTestCase): self.assertEqual(utils.match_language('he-IL', ['iw-IL'], aliases), 'iw-IL') -class TestHTMLTextExtractor(SearxTestCase): +class TestHTMLTextExtractor(TestCase): def setUp(self): self.html_text_extractor = utils.HTMLTextExtractor() @@ -110,7 +110,7 @@ class TestHTMLTextExtractor(SearxTestCase): self.assertIn(entity, self.html_text_extractor.result) -class TestUnicodeWriter(SearxTestCase): +class TestUnicodeWriter(TestCase): def setUp(self): self.unicode_writer = utils.UnicodeWriter(mock.MagicMock()) diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py index 165426e599d022c057b52be7cd2dc93988ac1b14..f8aa531fc918f6c2afcb979c5057b1dd9ecf847a 100644 --- a/tests/unit/test_webapp.py +++ b/tests/unit/test_webapp.py @@ -4,12 +4,12 @@ import json from mock import Mock, patch from mockredis import mock_strict_redis_client from searx import webapp -from searx.testing import SearxTestCase +from unittest import TestCase from searx.search import Search from searx.url_utils import ParseResult -class ViewsTestCase(SearxTestCase): +class ViewsTestCase(TestCase): def setUp(self): webapp.app.config['TESTING'] = True # to get better error messages