summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile1
-rw-r--r--searx/testing.py20
2 files changed, 10 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 0fc7f996f..85f9760d0 100644
--- a/Makefile
+++ b/Makefile
@@ -77,6 +77,7 @@ test: test.pylint test.pep8 test.unit test.robot
# TODO: balance linting with pylint
test.pylint: pylint-exe
$(call cmd,pylint,searx/preferences.py)
+ $(call cmd,pylint,searx/testing.py)
test.pep8: pyenvinstall
$(PY_ENV_ACT); ./manage.sh pep8_check
diff --git a/searx/testing.py b/searx/testing.py
index a3616dc12..8931c6a88 100644
--- a/searx/testing.py
+++ b/searx/testing.py
@@ -1,37 +1,38 @@
# -*- coding: utf-8 -*-
+# SPDX-License-Identifier: AGPL-3.0-or-later
"""Shared testing code."""
+# pylint: disable=missing-function-docstring
import os
import subprocess
import traceback
-from os.path import dirname, join, abspath
+from os.path import dirname, join, abspath, realpath
from splinter import Browser
from unittest2 import TestCase
-
class SearxTestLayer:
"""Base layer for non-robot tests."""
__name__ = u'SearxTestLayer'
+ @classmethod
def setUp(cls):
pass
- setUp = classmethod(setUp)
+ @classmethod
def tearDown(cls):
pass
- tearDown = classmethod(tearDown)
+ @classmethod
def testSetUp(cls):
pass
- testSetUp = classmethod(testSetUp)
+ @classmethod
def testTearDown(cls):
pass
- testTearDown = classmethod(testTearDown)
class SearxRobotLayer():
@@ -41,10 +42,7 @@ class SearxRobotLayer():
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'
- )
+ webapp = join(abspath(dirname(realpath(__file__))), 'webapp.py')
exe = 'python'
# set robot settings path
@@ -105,7 +103,7 @@ if __name__ == '__main__':
try:
test_layer.setUp()
run_robot_tests([getattr(robot, x) for x in dir(robot) if x.startswith('test_')])
- except Exception:
+ except Exception: # pylint: disable=broad-except
errors = True
print('Error occured: {0}'.format(traceback.format_exc()))
test_layer.tearDown()