Revert commit fb5134f.

ethereum · Sep 8, 2022 · 03adf2f · 03adf2f
1 parent fb5134f
commit 03adf2f
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 30 deletions.
diff --git a/pytest.ini b/pytest.ini
@@ -3,8 +3,6 @@ addopts= -v --showlocals --durations 10
 python_paths= .
 xfail_strict=true
 asyncio_mode=strict
-markers =
-    flaky: tests that are flaky but run well when separated into own group
 
 [pytest-watch]
 runner= pytest --failed-first --maxfail=1 --no-success-flaky-report
diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py
@@ -19,30 +19,6 @@
 )
 
 
-def pytest_addoption(parser):
-    parser.addoption("--flaky")
-
-
-def pytest_collection_modifyitems(items, config):
-    flaky_tests = []
-    non_flaky_tests = []
-
-    for item in items:
-        if any(_ in item.fixturenames for _ in (
-                "unlocked_account", "unlocked_account_dual_type"
-        )) or "offchain_lookup" in item.name:
-            flaky_tests.append(item)
-        else:
-            non_flaky_tests.append(item)
-
-    if config.option.flaky == "True":
-        items[:] = flaky_tests
-        config.hook.pytest_deselected(items=non_flaky_tests)
-    else:
-        items[:] = non_flaky_tests
-        config.hook.pytest_deselected(items=flaky_tests)
-
-
 @pytest.fixture(scope="module")
 def math_contract_factory(w3):
     contract_factory = w3.eth.contract(abi=MATH_ABI, bytecode=MATH_BYTECODE)

diff --git a/tox.ini b/tox.ini
@@ -36,14 +36,11 @@ commands=
     ethpm: pytest {posargs:tests/ethpm}
     integration-goethereum-ipc_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ipc.py -k EthModule}
     integration-goethereum-ipc_non_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ipc.py -k "not EthModule"}
-    integration-goethereum-ipc_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ipc.py --flaky True}
     integration-goethereum-http_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py -k "EthModule and not Async"}
     integration-goethereum-http_non_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py -k "not EthModule and not Async"}
     integration-goethereum-http_async: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py -k Async}
-    integration-goethereum-http_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_http.py --flaky True}
     integration-goethereum-ws_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py -k EthModule}
-    integration-goethereum-ws_non_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py -k "not EthModule}
-    integration-goethereum-ws_flaky: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py --flaky True}
+    integration-goethereum-ws_non_eth: pytest {posargs:tests/integration/go_ethereum/test_goethereum_ws.py -k "not EthModule"}
     integration-ethtester: pytest {posargs:tests/integration/test_ethereum_tester.py}
     docs: make -C {toxinidir} validate-docs
 deps =