Skip to content

Commit be2f701

Browse files
committed
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
1 parent 4c9beb5 commit be2f701

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

Diff for: Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ lint-roll:
2929
$(MAKE) lint
3030

3131
test:
32-
py.test tests
32+
pytest tests
3333

3434
test-all:
3535
tox

Diff for: README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ Or, you can run multi-process tests in one command, but without color:
162162

163163
```sh
164164
# in the project root:
165-
py.test --numprocesses=4 --looponfail --maxfail=1
165+
pytest --numprocesses=4 --looponfail --maxfail=1
166166
# the same thing, succinctly:
167167
pytest -n 4 -f --maxfail=1
168168
```

Diff for: pytest.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ python_paths= .
44
xfail_strict=true
55

66
[pytest-watch]
7-
runner= py.test --failed-first --maxfail=1 --no-success-flaky-report
7+
runner= pytest --failed-first --maxfail=1 --no-success-flaky-report

Diff for: tox.ini

+9-9
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ ignore=
2626
[testenv]
2727
usedevelop=True
2828
commands=
29-
core: py.test {posargs:tests/core}
30-
ens: py.test {posargs:tests/ens}
31-
integration-goethereum-ipc: py.test {posargs:tests/integration/go_ethereum/test_goethereum_ipc.py}
32-
integration-goethereum-http: py.test {posargs:tests/integration/go_ethereum/test_goethereum_http.py}
33-
integration-goethereum-ws: py.test {posargs:tests/integration/go_ethereum/test_goethereum_ws.py}
34-
integration-ethtester: py.test {posargs:tests/integration/test_ethereum_tester.py}
35-
integration-parity-ipc: py.test -s {posargs:tests/integration/parity/test_parity_ipc.py}
36-
integration-parity-http: py.test -s {posargs:tests/integration/parity/test_parity_http.py}
37-
integration-parity-ws: py.test -s {posargs:tests/integration/parity/test_parity_ws.py}
29+
core: pytest {posargs:tests/core}
30+
ens: pytest {posargs:tests/ens}
31+
integration-goethereum-ipc: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ipc.py}
32+
integration-goethereum-http: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py}
33+
integration-goethereum-ws: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py}
34+
integration-ethtester: pytest {posargs:tests/integration/test_ethereum_tester.py}
35+
integration-parity-ipc: pytest -s {posargs:tests/integration/parity/test_parity_ipc.py}
36+
integration-parity-http: pytest -s {posargs:tests/integration/parity/test_parity_http.py}
37+
integration-parity-ws: pytest -s {posargs:tests/integration/parity/test_parity_ws.py}
3838
doctest: make -C {toxinidir}/docs doctest
3939
deps =
4040
-r{toxinidir}/requirements-dev.txt

0 commit comments

Comments
 (0)