Skip to content

Commit

Permalink
Use pytest instead of py.test per upstream recommendation, #dropthedot (
Browse files Browse the repository at this point in the history
  • Loading branch information
scop authored and Thea Flowers committed May 14, 2018
1 parent 7e1270b commit 839d468
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions system_tests/app_engine_test_app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"""App Engine standard application that runs basic system tests for
google.auth.app_engine.
This application has to run tests manually instead of using py.test because
py.test currently doesn't work on App Engine standard.
This application has to run tests manually instead of using pytest because
pytest currently doesn't work on App Engine standard.
"""

import contextlib
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ deps =
cryptography
grpcio; platform_python_implementation != 'PyPy'
commands =
py.test --cov=google.auth --cov=google.oauth2 --cov=tests {posargs:tests}
pytest --cov=google.auth --cov=google.oauth2 --cov=tests {posargs:tests}

[testenv:cover]
basepython = python3.6
commands =
py.test --cov=google.auth --cov=google.oauth2 --cov=tests --cov-report= tests
pytest --cov=google.auth --cov=google.oauth2 --cov=tests --cov-report= tests
coverage report --show-missing --fail-under=100
deps =
{[testenv]deps}
Expand Down

0 comments on commit 839d468

Please sign in to comment.