From 1b2ea675c841fd6e12101a6378a03fe400596734 Mon Sep 17 00:00:00 2001 From: fselmo Date: Fri, 15 Dec 2023 16:04:53 -0700 Subject: [PATCH] Name the flaky and regular eth-tester integration test runs similarly - ``tox`` seems to be picking up both runs otherwise in its pattern when looking for commands --- .circleci/config.yml | 10 +++++----- tox.ini | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4fc6a3eea8..600e14d6ca 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: @@ -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: @@ -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: @@ -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: @@ -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: diff --git a/tox.ini b/tox.ini index b31f7d165a..9658fabec5 100644 --- a/tox.ini +++ b/tox.ini @@ -36,7 +36,7 @@ commands= 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]