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

break up tox test runs with underscores where they should be unique #3173

Merged
merged 2 commits into from
Dec 18, 2023
Merged

break up tox test runs with underscores where they should be unique #3173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64f02a1
Break up unique test runs with underscores rather than hyphens
fselmo Dec 15, 2023
b724530
newsfragment for #3173
fselmo Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
30 changes: 15 additions & 15 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,14 +338,14 @@ jobs:
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws-v2
TOXENV: py37-integration-goethereum-ws_v2

py37-integration-goethereum-ws-v2_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-goethereum-ws-v2_flaky
TOXENV: py37-integration-goethereum-ws_v2_flaky

py37-integration-ethtester-pyevm:
<<: *common
Expand All @@ -360,7 +360,7 @@ jobs:
docker:
- image: cimg/python:3.7
environment:
TOXENV: py37-integration-ethtester-pyevm_flaky
TOXENV: py37-integration-ethtester_flaky
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend

py37-wheel-cli:
Expand Down Expand Up @@ -478,14 +478,14 @@ jobs:
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws-v2
TOXENV: py38-integration-goethereum-ws_v2

py38-integration-goethereum-ws-v2_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-goethereum-ws-v2_flaky
TOXENV: py38-integration-goethereum-ws_v2_flaky

py38-integration-ethtester-pyevm:
<<: *common
Expand All @@ -500,7 +500,7 @@ jobs:
docker:
- image: cimg/python:3.8
environment:
TOXENV: py38-integration-ethtester-pyevm_flaky
TOXENV: py38-integration-ethtester_flaky
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend

py38-wheel-cli:
Expand Down Expand Up @@ -617,14 +617,14 @@ jobs:
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws-v2
TOXENV: py39-integration-goethereum-ws_v2

py39-integration-goethereum-ws-v2_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-goethereum-ws-v2_flaky
TOXENV: py39-integration-goethereum-ws_v2_flaky

py39-integration-ethtester-pyevm:
<<: *common
Expand All @@ -639,7 +639,7 @@ jobs:
docker:
- image: cimg/python:3.9
environment:
TOXENV: py39-integration-ethtester-pyevm_flaky
TOXENV: py39-integration-ethtester_flaky
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend

py39-wheel-cli:
Expand Down Expand Up @@ -756,14 +756,14 @@ jobs:
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ws-v2
TOXENV: py310-integration-goethereum-ws_v2

py310-integration-goethereum-ws-v2_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-goethereum-ws-v2_flaky
TOXENV: py310-integration-goethereum-ws_v2_flaky

py310-integration-ethtester-pyevm:
<<: *common
Expand All @@ -778,7 +778,7 @@ jobs:
docker:
- image: cimg/python:3.10
environment:
TOXENV: py310-integration-ethtester-pyevm_flaky
TOXENV: py310-integration-ethtester_flaky
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend

py310-wheel-cli:
Expand Down Expand Up @@ -901,14 +901,14 @@ jobs:
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ws-v2
TOXENV: py311-integration-goethereum-ws_v2

py311-integration-goethereum-ws-v2_flaky:
<<: *geth_steps
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-goethereum-ws-v2_flaky
TOXENV: py311-integration-goethereum-ws_v2_flaky

py311-integration-ethtester-pyevm:
<<: *common
Expand All @@ -923,7 +923,7 @@ jobs:
docker:
- image: cimg/python:3.11
environment:
TOXENV: py311-integration-ethtester-pyevm_flaky
TOXENV: py311-integration-ethtester_flaky
ETHEREUM_TESTER_CHAIN_BACKEND: eth_tester.backends.PyEVMBackend

py311-wheel-cli:
Expand Down
1 change: 1 addition & 0 deletions newsfragments/3173.internal.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Small fix for integration tests for ``tox`` to recognize independent patterns for each test run.
6 changes: 3 additions & 3 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ commands=
integration-goethereum-http_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py --flaky}
integration-goethereum-ws: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py}
integration-goethereum-ws_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py --flaky}
integration-goethereum-ws-v2: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws_v2}
integration-goethereum-ws-v2_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws_v2 --flaky}
integration-goethereum-ws_v2: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws_v2}
integration-goethereum-ws_v2_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws_v2 --flaky}
integration-ethtester: pytest {posargs:tests/integration/test_ethereum_tester.py}
integration-ethtester-pyevm_flaky: pytest {posargs:tests/integration/test_ethereum_tester.py --flaky}
integration-ethtester_flaky: pytest {posargs:tests/integration/test_ethereum_tester.py --flaky}
docs: make -C {toxinidir} validate-docs
deps =
.[dev]
Expand Down