Skip to content

Commit 57cf810

Browse files
committed
Moves coverage report generation to pytest from nosetests
Uses pytest instead of py.test for all test runners Uses Python 3.7 instead of Python 2.7 for the coverage runner
1 parent 49f47c4 commit 57cf810

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ matrix:
1414
env: TOXENV=update-pycodestyle
1515
- python: 3.7
1616
env: TOXENV=docs
17-
- python: 2.7
17+
- python: 3.7
1818
env: TOXENV=coverage,codecov
1919
- python: 3.5
2020
env: TOXENV=py35

tox.ini

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ deps = -r{toxinidir}/test-requirements.txt
99
-r{toxinidir}/requirements.txt
1010
commands =
1111
python -V
12-
py.test -vvv -s --ignore=kubernetes/e2e_test
12+
pytest -vvv -s --ignore=kubernetes/e2e_test
1313

1414
[testenv:docs]
1515
commands =
@@ -22,27 +22,27 @@ commands =
2222
[testenv:py27-functional]
2323
commands =
2424
python -V
25-
{toxinidir}/scripts/kube-init.sh py.test -vvv -s []
25+
{toxinidir}/scripts/kube-init.sh pytest -vvv -s []
2626

2727
[testenv:py35-functional]
2828
commands =
2929
python -V
30-
{toxinidir}/scripts/kube-init.sh py.test -vvv -s []
30+
{toxinidir}/scripts/kube-init.sh pytest -vvv -s []
3131

3232
[testenv:py36-functional]
3333
commands =
3434
python -V
35-
{toxinidir}/scripts/kube-init.sh py.test -vvv -s []
35+
{toxinidir}/scripts/kube-init.sh pytest -vvv -s []
3636

3737
[testenv:py37-functional]
3838
commands =
3939
python -V
40-
{toxinidir}/scripts/kube-init.sh py.test -vvv -s []
40+
{toxinidir}/scripts/kube-init.sh pytest -vvv -s []
4141

4242
[testenv:coverage]
4343
commands =
4444
python -V
45-
nosetests --with-coverage --cover-package=kubernetes.config,kubernetes.watch --cover-tests
45+
pytest --ignore=kubernetes/e2e_test --cov=kubernetes/watch --cov=kubernetes/config
4646

4747
[testenv:codecov]
4848
commands =

0 commit comments

Comments
 (0)