Skip to content

Commit

Permalink
Just pytest, not py.test
Browse files Browse the repository at this point in the history
  • Loading branch information
bennylope committed Dec 12, 2017
1 parent b710e3a commit f19a85a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,10 @@ lint:
flake8 organizations

test:
py.test ${TEST_FLAGS}
pytest ${TEST_FLAGS}

test-coverage: clean-test
-py.test ${COVER_FLAGS} ${TEST_FLAGS}
-pytest ${COVER_FLAGS} ${TEST_FLAGS}
@exit_code=$?
@-coverage html
@exit ${exit_code}
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ envlist =
[testenv]
setenv =
PYTHONPATH = {toxinidir}:{toxinidir}/organizations
commands = py.test --cov=organizations
commands = pytest --cov=organizations
basepython =
py27: python2.7
py34: python3.4
Expand Down

0 comments on commit f19a85a

Please sign in to comment.