From 5c08c15d8035364f36386c2bc56d35bfa7bcd90e Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Tue, 17 Mar 2026 22:29:18 +0100
Subject: [PATCH 1/2] chore(deps): bump ethereum-hive to latest release

No changes for single-test hive test/clients; this ethereum-hive release updates the name of the method and endpoint for registering tests agains a multi-test client, cf ethereum/hive-python-api#15.
---
 packages/testing/pyproject.toml | 2 +-
 uv.lock                         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/testing/pyproject.toml b/packages/testing/pyproject.toml
index ee5c2c7ddf4..f9b5960a7ab 100644
--- a/packages/testing/pyproject.toml
+++ b/packages/testing/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
 ]
 dependencies = [
     "click>=8.1.0,<9",
-    "ethereum-hive>=0.1.0a1,<1.0.0",
+    "ethereum-hive>=0.1.0a5,<1.0.0",
     "ethereum-execution",
     "gitpython>=3.1.31,<4",
     "PyJWT>=2.3.0,<3",
diff --git a/uv.lock b/uv.lock
index e4aada63d55..b606382f62f 100644
--- a/uv.lock
+++ b/uv.lock
@@ -1110,7 +1110,7 @@ requires-dist = [
     { name = "colorlog", specifier = ">=6.7.0,<7" },
     { name = "eth-abi", specifier = ">=5.2.0" },
     { name = "ethereum-execution", editable = "." },
-    { name = "ethereum-hive", specifier = ">=0.1.0a1,<1.0.0" },
+    { name = "ethereum-hive", specifier = ">=0.1.0a5,<1.0.0" },
     { name = "ethereum-rlp", specifier = ">=0.1.5,<0.2" },
     { name = "ethereum-types", specifier = ">=0.3.0,<0.4" },
     { name = "filelock", specifier = ">=3.15.1,<4" },
@@ -1155,14 +1155,14 @@ test = [{ name = "pytest-cov", specifier = ">=4.1.0,<5" }]
 
 [[package]]
 name = "ethereum-hive"
-version = "0.1.0a2"
+version = "0.1.0a5"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "requests" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/b3/9b/f15c86866245ad5c22dbc98f433158fdeaab3e96eae4efd1bf6a12a7717c/ethereum_hive-0.1.0a2.tar.gz", hash = "sha256:9ddc08a8dfe2828a9a4abfca1c0972f88882fa06fb6a3e111ec013b66906f843", size = 74796, upload-time = "2025-07-15T05:38:36.983Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/40/a8/95676acd86095a5dcf5dacfa5a991175b3a547dcd5729735fea777b8feec/ethereum_hive-0.1.0a5.tar.gz", hash = "sha256:bf91d3144c263a1a6407c931b3864ab3edd40bc5c34b812e571e7c49cc70f9eb", size = 75064, upload-time = "2026-03-11T07:36:24.532Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/74/60/1daf13c49bbefed6b67dd8a5d1280386e1ad22c9ec61737d44047064632e/ethereum_hive-0.1.0a2-py3-none-any.whl", hash = "sha256:0b0253146428240725e2b83a86bbc9eab975c460b8d76ce3937ba5295aa2448b", size = 37578, upload-time = "2025-07-15T05:38:35.334Z" },
+    { url = "https://files.pythonhosted.org/packages/73/95/986727018ac0401562d91961e2f46462ed65a08e2d5162a255d9f871a7ad/ethereum_hive-0.1.0a5-py3-none-any.whl", hash = "sha256:3225747ed83a9124a697db0ab8d736c4820117462e64aa3395bbc1588c4d40d0", size = 37589, upload-time = "2026-03-11T07:36:23.286Z" },
 ]
 
 [[package]]

From fc09e89c7e8b0a93d4639050008ba4133403508e Mon Sep 17 00:00:00 2001
From: danceratopz <danceratopz@gmail.com>
Date: Tue, 17 Mar 2026 22:29:43 +0100
Subject: [PATCH 2/2] feat(test-consume): activate per-test result reporting
 for enginex tests

---
 .../consume/simulators/enginex/conftest.py    | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
index 80ad3405f2b..78c57a4fb7e 100644
--- a/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
+++ b/packages/testing/src/execution_testing/cli/pytest_commands/plugins/consume/simulators/enginex/conftest.py
@@ -122,6 +122,26 @@ def test_suite_description() -> str:
     )
 
 
+@pytest.fixture(scope="function", autouse=True)
+def _per_test_reporting(
+    client: Client,
+    hive_test: HiveTest,
+) -> None:
+    """
+    Register a test for execution against a multi-test client.
+
+    Activate log segment capturing in the Hive backend for correct
+    client log reporting in the multi-test client case.
+
+    Parameter order matters: `client` listed before `hive_test`
+    ensures pytest sets up `client` first and tears it down last.
+    This guarantees `hive_test` teardown (`test.end()`) runs while
+    the hive node still exists, before `client` teardown calls
+    `mark_test_completed` / `client.stop()`.
+    """
+    hive_test.register_multi_test_client(client)
+
+
 @pytest.fixture(scope="function")
 def client(
     multi_test_hive_test: HiveTest,
@@ -179,6 +199,7 @@ def client(
         multi_test_client_manager.register_client(
             group_identifier, resolved_client
         )
+        resolved_client.multi_test = True
 
     try:
         yield resolved_client