Skip to content

Commit

Permalink
Return py.test status code for tox
Browse files Browse the repository at this point in the history
Also remove a nose left-over env var in tox config
  • Loading branch information
mvantellingen committed May 4, 2015
1 parent f02ffa5 commit bee9579
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 2 additions & 1 deletion runtests.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,4 +82,5 @@
'ignore', r'.*', DeprecationWarning, libs)

os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'tests.settings')
pytest.main(args)
result_code = pytest.main(args)
sys.exit(result_code)
2 changes: 0 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ envlist = {py27,py33,py34}-{1.7,1.8}

[testenv]
commands = python runtests.py
setenv =
NOSE_NOPATH = true
deps =
-r{toxinidir}/requirements.txt
1.7: django==1.7.8
Expand Down

0 comments on commit bee9579

Please sign in to comment.