Skip to content

Commit

Permalink
Ensure tests aren't accidentially run against wrong fork
Browse files Browse the repository at this point in the history
Some test directories have fork names in the
directory name. Globbing tests based on -k <ForkName>
causes tests against <ForkName> to include tests
that actuall go against <OtherForkName> only because
<ForkName> matches against the glob because it
appears in the directory name.
  • Loading branch information
cburgdorf committed Oct 17, 2018
1 parent 79af447 commit d6f3ba1
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -25,25 +25,25 @@ commands=
p2p: pytest {posargs:tests/p2p}
database: pytest {posargs:tests/database}
rpc-blockchain: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'not GeneralStateTests'}
rpc-state-frontier: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Frontier'}
rpc-state-homestead: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Homestead'}
rpc-state-eip150: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP150'}
rpc-state-eip158: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and EIP158'}
rpc-state-frontier: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":Frontier"'}
rpc-state-homestead: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":Homestead"'}
rpc-state-eip150: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":EIP150"'}
rpc-state-eip158: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":EIP158"'}
beacon: pytest {posargs:tests/beacon/}
# The following test seems to consume a lot of memory. Restricting to 3 processes reduces crashes
rpc-state-byzantium: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Byzantium'}
rpc-state-constantinople: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and Constantinople'}
rpc-state-byzantium: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":Byzantium"'}
rpc-state-constantinople: pytest -n3 {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and not stQuadraticComplexityTest and ":Constantinople"'}
rpc-state-quadratic: pytest {posargs:tests/trinity/json-fixtures-over-rpc/test_rpc_fixtures.py -k 'GeneralStateTests and stQuadraticComplexityTest'}
transactions: pytest {posargs:tests/json-fixtures/test_transactions.py}
vm: pytest {posargs:tests/json-fixtures/test_virtual_machine.py}
native-blockchain: pytest {posargs:tests/json-fixtures/test_blockchain.py}
native-state-frontier: pytest {posargs:tests/json-fixtures/test_state.py -k Frontier}
native-state-homestead: pytest {posargs:tests/json-fixtures/test_state.py -k Homestead}
native-state-eip150: pytest {posargs:tests/json-fixtures/test_state.py -k EIP150}
native-state-eip158: pytest {posargs:tests/json-fixtures/test_state.py -k EIP158}
native-state-byzantium: pytest {posargs:tests/json-fixtures/test_state.py -k Byzantium}
native-state-constantinople: pytest {posargs:tests/json-fixtures/test_state.py -k Constantinople}
native-state-metropolis: pytest {posargs:tests/json-fixtures/test_state.py -k Metropolis}
native-state-frontier: pytest {posargs:tests/json-fixtures/test_state.py -k :Frontier}
native-state-homestead: pytest {posargs:tests/json-fixtures/test_state.py -k :Homestead}
native-state-eip150: pytest {posargs:tests/json-fixtures/test_state.py -k :EIP150}
native-state-eip158: pytest {posargs:tests/json-fixtures/test_state.py -k :EIP158}
native-state-byzantium: pytest {posargs:tests/json-fixtures/test_state.py -k :Byzantium}
native-state-constantinople: pytest {posargs:tests/json-fixtures/test_state.py -k :Constantinople}
native-state-metropolis: pytest {posargs:tests/json-fixtures/test_state.py -k :Metropolis}
lightchain_integration: pytest --integration {posargs:tests/trinity/integration/test_lightchain_integration.py}

deps = .[p2p,trinity,eth-extra,test]
Expand Down

0 comments on commit d6f3ba1

Please sign in to comment.