Browse Source

searx/testing.py: pylint & SPDX tag (no functional change)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Markus Heiser 5 years ago
parent
commit
4a94b4cca6
2 changed files with 10 additions and 11 deletions
  1. 1 0
      Makefile
  2. 9 11
      searx/testing.py

+ 1 - 0
Makefile

@@ -77,6 +77,7 @@ test: test.pylint test.pep8 test.unit test.robot
 # TODO: balance linting with pylint
 # TODO: balance linting with pylint
 test.pylint: pylint-exe
 test.pylint: pylint-exe
 	$(call cmd,pylint,searx/preferences.py)
 	$(call cmd,pylint,searx/preferences.py)
+	$(call cmd,pylint,searx/testing.py)
 
 
 test.pep8: pyenvinstall
 test.pep8: pyenvinstall
 	$(PY_ENV_ACT); ./manage.sh pep8_check
 	$(PY_ENV_ACT); ./manage.sh pep8_check

+ 9 - 11
searx/testing.py

@@ -1,37 +1,38 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
+# SPDX-License-Identifier: AGPL-3.0-or-later
 """Shared testing code."""
 """Shared testing code."""
 
 
+# pylint: disable=missing-function-docstring
 
 
 import os
 import os
 import subprocess
 import subprocess
 import traceback
 import traceback
 
 
-from os.path import dirname, join, abspath
+from os.path import dirname, join, abspath, realpath
 
 
 from splinter import Browser
 from splinter import Browser
 from unittest2 import TestCase
 from unittest2 import TestCase
 
 
-
 class SearxTestLayer:
 class SearxTestLayer:
     """Base layer for non-robot tests."""
     """Base layer for non-robot tests."""
 
 
     __name__ = u'SearxTestLayer'
     __name__ = u'SearxTestLayer'
 
 
+    @classmethod
     def setUp(cls):
     def setUp(cls):
         pass
         pass
-    setUp = classmethod(setUp)
 
 
+    @classmethod
     def tearDown(cls):
     def tearDown(cls):
         pass
         pass
-    tearDown = classmethod(tearDown)
 
 
+    @classmethod
     def testSetUp(cls):
     def testSetUp(cls):
         pass
         pass
-    testSetUp = classmethod(testSetUp)
 
 
+    @classmethod
     def testTearDown(cls):
     def testTearDown(cls):
         pass
         pass
-    testTearDown = classmethod(testTearDown)
 
 
 
 
 class SearxRobotLayer():
 class SearxRobotLayer():
@@ -41,10 +42,7 @@ class SearxRobotLayer():
         os.setpgrp()  # create new process group, become its leader
         os.setpgrp()  # create new process group, become its leader
 
 
         # get program paths
         # 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'
         exe = 'python'
 
 
         # set robot settings path
         # set robot settings path
@@ -105,7 +103,7 @@ if __name__ == '__main__':
         try:
         try:
             test_layer.setUp()
             test_layer.setUp()
             run_robot_tests([getattr(robot, x) for x in dir(robot) if x.startswith('test_')])
             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
             errors = True
             print('Error occured: {0}'.format(traceback.format_exc()))
             print('Error occured: {0}'.format(traceback.format_exc()))
         test_layer.tearDown()
         test_layer.tearDown()