Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use pytest instead of py.test per upstream recommendation, #dropthedot #255

Merged
merged 1 commit into from
May 14, 2018
Merged

Use pytest instead of py.test per upstream recommendation, #dropthedot #255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions system_tests/app_engine_test_app/main.py
View file
Open in desktop
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
View file
Open in desktop
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