Commit f758f049d9b092fe84826263648bc32901e97442
1 parent
39c37442
Exists in
master
and in
31 other branches
Running behave with setup.py test
Showing
1 changed file
with
5 additions
and
2 deletions
Show diff stats
tests/run.py
@@ -12,15 +12,18 @@ os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' | @@ -12,15 +12,18 @@ os.environ['COVERAGE_PROCESS_START'] = '.coveragerc' | ||
12 | import django | 12 | import django |
13 | import coverage | 13 | import coverage |
14 | 14 | ||
15 | -from django.test.utils import get_runner | ||
16 | from django.conf import settings | 15 | from django.conf import settings |
16 | +from django.core.management import execute_from_command_line | ||
17 | +from django.test.utils import get_runner | ||
17 | 18 | ||
18 | 19 | ||
19 | def runtests(): | 20 | def runtests(): |
20 | if django.VERSION >= (1, 7, 0): | 21 | if django.VERSION >= (1, 7, 0): |
21 | django.setup() | 22 | django.setup() |
23 | + | ||
22 | test_runner = get_runner(settings) | 24 | test_runner = get_runner(settings) |
23 | failures = test_runner(interactive=False, failfast=False).run_tests([]) | 25 | failures = test_runner(interactive=False, failfast=False).run_tests([]) |
26 | + execute_from_command_line(['colab-admin', 'behave']) | ||
24 | sys.exit(failures) | 27 | sys.exit(failures) |
25 | 28 | ||
26 | 29 | ||
@@ -32,4 +35,4 @@ def run_with_coverage(): | @@ -32,4 +35,4 @@ def run_with_coverage(): | ||
32 | 35 | ||
33 | 36 | ||
34 | if __name__ == '__main__': | 37 | if __name__ == '__main__': |
35 | - runtests_with_coverage() | 38 | + run_with_coverage() |