git.iko.soy/searx
on master help sign in
[fix] robot tests and pep8 check
commit39d2e0427f496e321a38e8a57b01a2c6043d2339 authorAdam Tauber <asciimoo@gmail.com> dateSat 2 Jan 2016, 12:15 (11 years ago) parent3498b7c
3 files changed+20−6
compare with master
unifiedsplit
.gitignore+1 manage.sh+2−3 searx/testing.py+17−3
.gitignore+1
@@ -5,6 +5,7 @@ env
55robot_log.html
66robot_output.xml
77robot_report.html
8+test_basic/
89setup.cfg
910
1011*.pyc
manage.sh+2−3
@@ -15,7 +15,7 @@ update_dev_packages() {
1515
1616pep8_check() {
1717 echo '[!] Running pep8 check'
18− pep8 "$SEARX_DIR" "$BASE_DIR/tests"
18+ pep8 --max-line-length=120 "$SEARX_DIR" "$BASE_DIR/tests"
1919}
2020
2121unit_tests() {
@@ -32,8 +32,7 @@ py_test_coverage() {
3232
3333robot_tests() {
3434 echo '[!] Running robot tests'
35− python -c "import zope.testrunner; import sys; sys.exit(zope.testrunner.run("\
36−"['--color', '--auto-progress', '--layer', 'SearxRobotLayer', '--test-path', '$BASE_DIR']))"
35+ PYTHONPATH=`pwd` python "$SEARX_DIR/testing.py" robot
3736}
3837
3938tests() {
searx/testing.py+17−3
@@ -3,6 +3,7 @@
33
44from plone.testing import Layer
55from unittest2 import TestCase
6+from os.path import dirname, join, abspath
67
78
89import os
@@ -42,11 +43,11 @@ class SearxRobotLayer(Layer):
4243 os.path.abspath(os.path.dirname(os.path.realpath(__file__))),
4344 'webapp.py'
4445 )
45− exe = os.path.abspath(os.path.dirname(__file__) + '/../bin/py')
46+ exe = 'python'
4647
4748 # set robot settings path
48− os.environ['SEARX_SETTINGS_PATH'] = os.path.abspath(
49− os.path.dirname(__file__) + '/settings_robot.yml')
49+ os.environ['SEARX_SETTINGS_PATH'] = abspath(
50+ dirname(__file__) + '/settings_robot.yml')
5051
5152 # run the server
5253 self.server = subprocess.Popen(
@@ -68,3 +69,16 @@ class SearxTestCase(TestCase):
6869 """Base test case for non-robot tests."""
6970
7071 layer = SearxTestLayer
72+
73+
74+if __name__ == '__main__':
75+ from tests.test_robot import test_suite
76+ import sys
77+ from zope.testrunner.runner import Runner
78+
79+ base_dir = abspath(join(dirname(__file__), '../tests'))
80+ if sys.argv[1] == 'robot':
81+ Runner(['--color',
82+ '--auto-progress',
83+ '--path', base_dir],
84+ found_suites=[test_suite()]).run()