Show More
@@ -0,0 +1,9 b'' | |||||
|
1 | [pytest] | |||
|
2 | # only look for tests in kallithea/tests | |||
|
3 | python_files = kallithea/tests/**/test_*.py | |||
|
4 | addopts = | |||
|
5 | # --verbose | |||
|
6 | # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings. | |||
|
7 | -rfEsxXw | |||
|
8 | # Shorter scrollbacks; less stuff to scroll through | |||
|
9 | --tb=short |
@@ -10,13 +10,6 b' from unittest import TestCase' | |||||
10 |
|
10 | |||
11 | def skip_test(func): |
|
11 | def skip_test(func): | |
12 | try: |
|
12 | try: | |
13 | from nose.tools import nottest |
|
|||
14 | except ImportError: |
|
|||
15 | pass |
|
|||
16 | else: |
|
|||
17 | func = nottest(func) |
|
|||
18 |
|
||||
19 | try: |
|
|||
20 | import pytest |
|
13 | import pytest | |
21 | except ImportError: |
|
14 | except ImportError: | |
22 | pass |
|
15 | pass |
@@ -3,22 +3,8 b' tag_build =' | |||||
3 | tag_svn_revision = 0 |
|
3 | tag_svn_revision = 0 | |
4 | tag_date = 0 |
|
4 | tag_date = 0 | |
5 |
|
5 | |||
6 | [nosetests] |
|
6 | [aliases] | |
7 | verbose = True |
|
7 | test = pytest | |
8 | verbosity = 2 |
|
|||
9 | with-pylons = kallithea/tests/test.ini |
|
|||
10 | detailed-errors = 1 |
|
|||
11 | nologcapture = 1 |
|
|||
12 |
|
||||
13 | [pytest] |
|
|||
14 | # only look for tests in kallithea/tests |
|
|||
15 | python_files = kallithea/tests/**/test_*.py |
|
|||
16 | addopts = |
|
|||
17 | # --verbose |
|
|||
18 | # show extra test summary info as specified by chars (f)ailed, (E)error, (s)skipped, (x)failed, (X)passed, (w)warnings. |
|
|||
19 | -rfEsxXw |
|
|||
20 | # Shorter scrollbacks; less stuff to scroll through |
|
|||
21 | --tb=short |
|
|||
22 |
|
8 | |||
23 | [compile_catalog] |
|
9 | [compile_catalog] | |
24 | domain = kallithea |
|
10 | domain = kallithea |
@@ -54,6 +54,7 b' requirements = [' | |||||
54 | "mock", |
|
54 | "mock", | |
55 | "URLObject==2.3.4", |
|
55 | "URLObject==2.3.4", | |
56 | "Routes==1.13", |
|
56 | "Routes==1.13", | |
|
57 | "pytest>=2.7.0,<3.0", | |||
57 | "dulwich>=0.9.9,<=0.9.9", |
|
58 | "dulwich>=0.9.9,<=0.9.9", | |
58 | "mercurial>=2.9,<3.7", |
|
59 | "mercurial>=2.9,<3.7", | |
59 | ] |
|
60 | ] | |
@@ -147,11 +148,12 b' setup(' | |||||
147 | url=__url__, |
|
148 | url=__url__, | |
148 | install_requires=requirements, |
|
149 | install_requires=requirements, | |
149 | classifiers=classifiers, |
|
150 | classifiers=classifiers, | |
150 |
setup_requires=[ |
|
151 | setup_requires=['PasteScript>=1.6.3', | |
|
152 | 'pytest-runner'], | |||
|
153 | tests_require=['pytest'], | |||
151 | data_files=data_files, |
|
154 | data_files=data_files, | |
152 | packages=packages, |
|
155 | packages=packages, | |
153 | include_package_data=True, |
|
156 | include_package_data=True, | |
154 | test_suite='nose.collector', |
|
|||
155 | package_data=package_data, |
|
157 | package_data=package_data, | |
156 | message_extractors={'kallithea': [ |
|
158 | message_extractors={'kallithea': [ | |
157 | ('**.py', 'python', None), |
|
159 | ('**.py', 'python', None), | |
@@ -184,8 +186,5 b' setup(' | |||||
184 | upgrade-db=kallithea.lib.dbmigrate:UpgradeDb |
|
186 | upgrade-db=kallithea.lib.dbmigrate:UpgradeDb | |
185 | celeryd=kallithea.lib.celerypylons.commands:CeleryDaemonCommand |
|
187 | celeryd=kallithea.lib.celerypylons.commands:CeleryDaemonCommand | |
186 | install-iis=kallithea.lib.paster_commands.install_iis:Command |
|
188 | install-iis=kallithea.lib.paster_commands.install_iis:Command | |
187 |
|
||||
188 | [nose.plugins] |
|
|||
189 | pylons = pylons.test:PylonsPlugin |
|
|||
190 | """, |
|
189 | """, | |
191 | ) |
|
190 | ) |
General Comments 0
You need to be logged in to leave comments.
Login now