Change pytest scope to function for all integration tests:

- Instantiate a new geth instance for each test to avoid muddied
  context between tests

- Lower the ``dev.period`` to ``1`` since the tests don't need to account for
  each other anymore

- Parallelize the tests in CI with pytest-xdist (``-n 10``)

- Properly disconnect the ``async_await_w3`` ws tests

Author: fselmo

newsfragments/3659.internal.rst

@@ -0,0 +1 @@
+Run each integration test in isolation and parallelize, instead of running them all within a single `geth` (for example) process. This prevents muddied test contexts.

tests/integration/conftest.py

@@ -19,47 +19,47 @@
 )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def math_contract_factory(w3):
     contract_factory = w3.eth.contract(
         abi=MATH_CONTRACT_ABI, bytecode=MATH_CONTRACT_BYTECODE
     )
     return contract_factory
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def emitter_contract_factory(w3):
     contract_factory = w3.eth.contract(
         abi=EMITTER_CONTRACT_ABI, bytecode=EMITTER_CONTRACT_BYTECODE
     )
     return contract_factory
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def revert_contract_factory(w3):
     contract_factory = w3.eth.contract(
         abi=REVERT_CONTRACT_ABI, bytecode=REVERT_CONTRACT_BYTECODE
     )
     return contract_factory
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def offchain_lookup_contract_factory(w3):
     contract_factory = w3.eth.contract(
         abi=OFFCHAIN_LOOKUP_ABI, bytecode=OFFCHAIN_LOOKUP_BYTECODE
     )
     return contract_factory
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_offchain_lookup_contract_factory(async_w3):
     contract_factory = async_w3.eth.contract(
         abi=OFFCHAIN_LOOKUP_ABI, bytecode=OFFCHAIN_LOOKUP_BYTECODE
     )
     return contract_factory
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def event_loop():
     loop = asyncio.get_event_loop_policy().new_event_loop()
     yield loop

tests/integration/go_ethereum/conftest.py

@@ -37,7 +37,7 @@
 GETH_FIXTURE_ZIP = "geth-1.15.5-fixture.zip"
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def geth_binary():
     from geth.install import (
         get_executable_path,
@@ -67,7 +67,7 @@ def absolute_datadir(directory_name):
     )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def get_geth_version(geth_binary):
     from geth import (
         get_geth_version,
@@ -86,15 +86,15 @@ def get_geth_version(geth_binary):
     return geth_version
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def base_geth_command_arguments(geth_binary, datadir):
     return (
         geth_binary,
         "--datadir",
         datadir,
         "--dev",
         "--dev.period",
-        "2",
+        "1",
         "--password",
         os.path.join(datadir, "keystore", "pw.txt"),
         # in order to raise on underpriced transactions, ``txpool.nolocals`` is now
@@ -103,15 +103,15 @@ def base_geth_command_arguments(geth_binary, datadir):
     )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def geth_zipfile_version(get_geth_version):
     # TODO: Remove support for 1.13.x in next major version
     if get_geth_version.major == 1 and get_geth_version.minor in [13, 14, 15]:
         return GETH_FIXTURE_ZIP
     raise AssertionError("Unsupported geth version")
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def datadir(tmpdir_factory, geth_zipfile_version):
     zipfile_path = absolute_datadir(geth_zipfile_version)
     base_dir = tmpdir_factory.mktemp("goethereum")
@@ -121,19 +121,19 @@ def datadir(tmpdir_factory, geth_zipfile_version):
     return tmp_datadir
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def geth_fixture_data(datadir):
     config_file_path = Path(datadir) / "config.json"
     return json.loads(config_file_path.read_text())
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def genesis_file(datadir):
     genesis_file_path = os.path.join(datadir, "genesis.json")
     return genesis_file_path
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def geth_process(geth_binary, datadir, genesis_file, geth_command_arguments):
     init_datadir_command = (
         geth_binary,
@@ -165,100 +165,100 @@ def geth_process(geth_binary, datadir, genesis_file, geth_command_arguments):
         )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def math_contract_deploy_txn_hash(geth_fixture_data):
     return geth_fixture_data["math_deploy_txn_hash"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def math_contract(math_contract_factory, geth_fixture_data):
     return math_contract_factory(address=geth_fixture_data["math_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def math_contract_address(math_contract, address_conversion_func):
     return address_conversion_func(math_contract.address)
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def emitter_contract(emitter_contract_factory, geth_fixture_data):
     return emitter_contract_factory(address=geth_fixture_data["emitter_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def emitter_contract_address(emitter_contract, address_conversion_func):
     return address_conversion_func(emitter_contract.address)
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def keyfile_account_pkey(geth_fixture_data):
     return geth_fixture_data["keyfile_account_pkey"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def keyfile_account_address(geth_fixture_data):
     return geth_fixture_data["keyfile_account_address"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def keyfile_account_address_dual_type(keyfile_account_address, address_conversion_func):
     yield keyfile_account_address
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def empty_block(w3, geth_fixture_data):
     block = w3.eth.get_block(geth_fixture_data["empty_block_hash"])
     assert is_dict(block)
     return block
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def block_with_txn(w3, geth_fixture_data):
     block = w3.eth.get_block(geth_fixture_data["block_with_txn_hash"])
     assert is_dict(block)
     return block
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def mined_txn_hash(geth_fixture_data):
     return geth_fixture_data["mined_txn_hash"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def block_with_txn_with_log(w3, geth_fixture_data):
     block = w3.eth.get_block(geth_fixture_data["block_hash_with_log"])
     assert is_dict(block)
     return block
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def txn_hash_with_log(geth_fixture_data):
     return geth_fixture_data["txn_hash_with_log"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def block_hash_revert_no_msg(geth_fixture_data):
     return geth_fixture_data["block_hash_revert_no_msg"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def block_hash_revert_with_msg(geth_fixture_data):
     return geth_fixture_data["block_hash_revert_with_msg"]
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def revert_contract(revert_contract_factory, geth_fixture_data):
     return revert_contract_factory(address=geth_fixture_data["revert_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def offchain_lookup_contract(offchain_lookup_contract_factory, geth_fixture_data):
     return offchain_lookup_contract_factory(
         address=geth_fixture_data["offchain_lookup_address"]
     )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def panic_errors_contract(
     w3,
     geth_fixture_data,
@@ -267,7 +267,7 @@ def panic_errors_contract(
     return contract_factory(address=geth_fixture_data["panic_errors_contract_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def storage_contract(
     w3,
     geth_fixture_data,
@@ -279,19 +279,19 @@ def storage_contract(
 # --- async --- #
 
 
-@pytest_asyncio.fixture(scope="module")
+@pytest_asyncio.fixture
 async def async_keyfile_account_address(geth_fixture_data):
     return geth_fixture_data["keyfile_account_address"]
 
 
-@pytest_asyncio.fixture(scope="module")
+@pytest_asyncio.fixture
 async def async_keyfile_account_address_dual_type(
     async_keyfile_account_address, address_conversion_func
 ):
     yield async_keyfile_account_address
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_offchain_lookup_contract(
     async_offchain_lookup_contract_factory, geth_fixture_data
 ):
@@ -300,7 +300,7 @@ def async_offchain_lookup_contract(
     )
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_panic_errors_contract(
     async_w3,
     geth_fixture_data,
@@ -309,35 +309,35 @@ def async_panic_errors_contract(
     return contract_factory(address=geth_fixture_data["panic_errors_contract_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_emitter_contract(async_w3, geth_fixture_data):
     contract_factory = async_w3.eth.contract(**EMITTER_CONTRACT_DATA)
     return contract_factory(address=geth_fixture_data["emitter_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_emitter_contract_address(async_emitter_contract, address_conversion_func):
     return address_conversion_func(async_emitter_contract.address)
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_math_contract(async_w3, geth_fixture_data):
     contract_factory = async_w3.eth.contract(**MATH_CONTRACT_DATA)
     return contract_factory(address=geth_fixture_data["math_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_math_contract_address(async_math_contract, address_conversion_func):
     return address_conversion_func(async_math_contract.address)
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_revert_contract(async_w3, geth_fixture_data):
     contract_factory = async_w3.eth.contract(**REVERT_CONTRACT_DATA)
     return contract_factory(address=geth_fixture_data["revert_address"])
 
 
-@pytest.fixture(scope="module")
+@pytest.fixture
 def async_storage_contract(
     async_w3,
     geth_fixture_data,
@@ -346,21 +346,21 @@ def async_storage_contract(
     return contract_factory(address=geth_fixture_data["storage_contract_address"])
 
 
-@pytest_asyncio.fixture(scope="module")
+@pytest_asyncio.fixture
 async def async_empty_block(async_w3, geth_fixture_data):
     block = await async_w3.eth.get_block(geth_fixture_data["empty_block_hash"])
     assert is_dict(block)
     return block
 
 
-@pytest_asyncio.fixture(scope="module")
+@pytest_asyncio.fixture
 async def async_block_with_txn(async_w3, geth_fixture_data):
     block = await async_w3.eth.get_block(geth_fixture_data["block_with_txn_hash"])
     assert is_dict(block)
     return block
 
 
-@pytest_asyncio.fixture(scope="module")
+@pytest_asyncio.fixture
 async def async_block_with_txn_with_log(async_w3, geth_fixture_data):
     block = await async_w3.eth.get_block(geth_fixture_data["block_hash_with_log"])
     assert is_dict(block)