ci/tests: ignore tests not matching --fork arg given to pytest.

Mostly a copy-paste from `py-evm` codebase; relevant PRs that
introduced the functionality there:

ethereum/py-evm#1470
ethereum/py-evm#1577

Author: veox

tests/json-fixtures-over-rpc/test_rpc_fixtures.py

@@ -16,6 +16,7 @@
     is_hex,
     is_integer,
     is_string,
+    to_tuple,
 )
 
 from eth.chains.mainnet import (
@@ -201,7 +202,7 @@ def fixture_transaction_in_rpc_format(state):
     }
 
 
-def blockchain_fixture_mark_fn(fixture_path, fixture_name):
+def blockchain_fixture_mark_fn(fixture_path, fixture_name, fixture_fork):
     for slow_test in SLOW_TESTS:
         if slow_test in fixture_path or slow_test in fixture_name:
             if not should_run_slow_tests():
@@ -211,13 +212,35 @@ def blockchain_fixture_mark_fn(fixture_path, fixture_name):
         return pytest.mark.xfail(reason="Listed in INCORRECT_UPSTREAM_TESTS.")
 
 
+# TODO: import from `py-evm` if possible?..
+def generate_ignore_fn_for_fork(passed_fork):
+    if passed_fork:
+        passed_fork = passed_fork.lower()
+
+        def ignore_fn(fixture_path, fixture_key, fixture_fork):
+            return fixture_fork.lower() != passed_fork
+
+        return ignore_fn
+
+
+# TODO: import from `py-evm` if possible?..
+@to_tuple
+def expand_fixtures_forks(all_fixtures):
+    for fixture_path, fixture_key in all_fixtures:
+        fixture = load_fixture(fixture_path, fixture_key)
+        yield fixture_path, fixture_key, fixture['network']
+
+
 def pytest_generate_tests(metafunc):
+    ignore_fn = generate_ignore_fn_for_fork(metafunc.config.getoption('fork'))
     generate_fixture_tests(
         metafunc=metafunc,
         base_fixture_path=BASE_FIXTURE_PATH,
+        preprocess_fn=expand_fixtures_forks,
         filter_fn=filter_fixtures(
             fixtures_base_dir=BASE_FIXTURE_PATH,
             mark_fn=blockchain_fixture_mark_fn,
+            ignore_fn=ignore_fn
         ),
     )
 
@@ -398,8 +421,9 @@ async def validate_uncles(rpc, block_fixture, at_block):
 
 @pytest.fixture
 def chain_fixture(fixture_data):
-    fixture = load_fixture(*fixture_data)
-    if fixture['network'] == 'Istanbul':
+    fixture_path, fixture_key, fixture_fork = fixture_data
+    fixture = load_fixture(fixture_path, fixture_key)
+    if fixture_fork == 'Istanbul':
         pytest.skip('Istanbul VM rules not yet supported')
     return fixture
 

tox.ini

@@ -26,15 +26,14 @@ commands=
     p2p: pytest -n 4 {posargs:tests/p2p}
     plugins: pytest -n 4 {posargs:tests/plugins/}
     rpc-blockchain: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'not GeneralStateTests'}
-    rpc-state-frontier: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Frontier'}
-    rpc-state-homestead: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Homestead'}
-    rpc-state-tangerine_whistle: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP150'}
-    rpc-state-spurious_dragon: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP158'}
+    rpc-state-frontier: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork Frontier -k 'GeneralStateTests and not stQuadraticComplexityTest'}
+    rpc-state-homestead: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork Homestead -k 'GeneralStateTests and not stQuadraticComplexityTest'}
+    rpc-state-tangerine_whistle: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork EIP150 -k 'GeneralStateTests and not stQuadraticComplexityTest'}
+    rpc-state-spurious_dragon: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork EIP158 -k 'GeneralStateTests and not stQuadraticComplexityTest'}
     # The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
-    rpc-state-byzantium: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
-    # Must match Constantinople but not ConstantinopleFix!
-    rpc-state-constantinople: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and not ConstantinopleFix and Constantinople'}
-    rpc-state-petersburg: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ConstantinopleFix'}
+    rpc-state-byzantium: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork Byzantium -k 'GeneralStateTests and not stQuadraticComplexityTest'}
+    rpc-state-constantinople: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork Constantinople -k 'GeneralStateTests and not stQuadraticComplexityTest'}
+    rpc-state-petersburg: pytest -n 3 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py --fork ConstantinopleFix -k 'GeneralStateTests and not stQuadraticComplexityTest'}
     rpc-state-quadratic: pytest -n 4 {posargs:tests/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and stQuadraticComplexityTest'}
     lightchain_integration: pytest --integration {posargs:tests/integration/test_lightchain_integration.py}