Update runtests to fully reflect py.test behavior
This commit is contained in:
parent
4d6a306099
commit
0b4859eb78
19
runtests.py
19
runtests.py
|
@ -52,23 +52,14 @@ if not settings.configured:
|
||||||
import djcelery
|
import djcelery
|
||||||
djcelery.setup_loader()
|
djcelery.setup_loader()
|
||||||
|
|
||||||
# from django_nose import NoseTestSuiteRunner
|
|
||||||
|
|
||||||
|
def runtests():
|
||||||
def runtests(*test_args, **kwargs):
|
|
||||||
if not test_args:
|
|
||||||
test_args = ['tests']
|
|
||||||
|
|
||||||
kwargs.setdefault('interactive', False)
|
|
||||||
|
|
||||||
test_runner = NoseTestSuiteRunner(**kwargs)
|
|
||||||
|
|
||||||
failures = test_runner.run_tests(test_args)
|
|
||||||
sys.exit(failures)
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
|
||||||
import pytest
|
import pytest
|
||||||
pytest.main(sys.argv)
|
pytest.main(sys.argv)
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
runtests()
|
||||||
# parser = OptionParser()
|
# parser = OptionParser()
|
||||||
# parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int)
|
# parser.add_option('--verbosity', dest='verbosity', action='store', default=1, type=int)
|
||||||
# parser.add_options(NoseTestSuiteRunner.options)
|
# parser.add_options(NoseTestSuiteRunner.options)
|
||||||
|
|
Loading…
Reference in New Issue