From 5e028f3d455880ad762ff883df2c22d930b928bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 13 May 2018 17:46:28 +0200 Subject: [PATCH] Use pytest instead of py.test per upstream recommendation, #dropthedot http://blog.pytest.org/2016/whats-new-in-pytest-30/ https://twitter.com/hashtag/dropthedot --- system_tests/app_engine_test_app/main.py | 4 ++-- tox.ini | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system_tests/app_engine_test_app/main.py b/system_tests/app_engine_test_app/main.py index c7b89ab8c..122b505fb 100644 --- a/system_tests/app_engine_test_app/main.py +++ b/system_tests/app_engine_test_app/main.py @@ -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 diff --git a/tox.ini b/tox.ini index be124e650..1c52c4bb0 100644 --- a/tox.ini +++ b/tox.ini @@ -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}