fix(fill,execute): register new label type markers to prevent warnings (#1245)

Author: danceratopz

docs/CHANGELOG.md

@@ -11,13 +11,14 @@ Test fixtures for use by clients are available for each release on the [Github r
 ### 🛠️ Framework
 
 - 🔀 Make `BaseFixture` able to parse any fixture format such as `BlockchainFixture` ([#1210](https://github.com/ethereum/execution-spec-tests/pull/1210)).
-- ✨ Blockchain and Blockchain-Engine tests now have a marker to specify that they were generated from a state test, which can be used with `-m blockchain_test_from_state_test` and `-m blockchain_test_engine_from_state_test` respectively ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220), [#1238](https://github.com/ethereum/execution-spec-tests/pull/1238)).
+- ✨ Blockchain and Blockchain-Engine tests now have a marker to specify that they were generated from a state test, which can be used with `-m blockchain_test_from_state_test` and `-m blockchain_test_engine_from_state_test` respectively ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
 - ✨ Blockchain and Blockchain-Engine tests that were generated from a state test now have `blockchain_test_from_state_test` or `blockchain_test_engine_from_state_test` as part of their test IDs ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
 - 🔀 Refactor `ethereum_test_fixtures` and `ethereum_clis` to create `FixtureConsumer` and `FixtureConsumerTool` classes which abstract away the consumption process used by `consume direct` ([#935](https://github.com/ethereum/execution-spec-tests/pull/935)).
 - ✨ Allow `consume direct --collect-only` without specifying a fixture consumer binary on the command-line ([#1237](https://github.com/ethereum/execution-spec-tests/pull/1237)).
 - ✨ Report the (resolved) fixture tarball URL and local fixture cache directory when `consume`'s `--input` flag is a release spec or URL  [#1239](https://github.com/ethereum/execution-spec-tests/pull/1239).
 - ✨ EOF Container validation tests (`eof_test`) now generate container deployment state tests, by wrapping the EOF container in an init-container and sending a deploy transaction ([#783](https://github.com/ethereum/execution-spec-tests/pull/783), [#1233](https://github.com/ethereum/execution-spec-tests/pull/1233)).
 - ✨ Use regexes for Hive's `--sim.limit` argument and don't use xdist if `--sim.parallelism==1` in the `eest/consume-rlp` and `eest/consume-rlp` simulators ([#1220](https://github.com/ethereum/execution-spec-tests/pull/1220)).
+- 🐞 Register generated test markers, e.g., `blockchain_test_from_state_test`, to prevent test session warnings ([#1238](https://github.com/ethereum/execution-spec-tests/pull/1238), [#1245](https://github.com/ethereum/execution-spec-tests/pull/1245)).
 
 ### 📋 Misc
 

src/ethereum_test_execution/base.py

@@ -45,17 +45,24 @@ class LabeledExecuteFormat:
 
     format: Type[BaseExecute]
     label: str
+    description: str
 
     registered_labels: ClassVar[Dict[str, "LabeledExecuteFormat"]] = {}
 
-    def __init__(self, execute_format: "Type[BaseExecute] | LabeledExecuteFormat", label: str):
+    def __init__(
+        self,
+        execute_format: "Type[BaseExecute] | LabeledExecuteFormat",
+        label: str,
+        description: str,
+    ):
         """Initialize the execute format with a custom label."""
         self.format = (
             execute_format.format
             if isinstance(execute_format, LabeledExecuteFormat)
             else execute_format
         )
         self.label = label
+        self.description = description
         if label not in LabeledExecuteFormat.registered_labels:
             LabeledExecuteFormat.registered_labels[label] = self
 

src/ethereum_test_fixtures/base.py

@@ -154,17 +154,24 @@ class LabeledFixtureFormat:
 
     format: Type[BaseFixture]
     label: str
+    description: str
 
     registered_labels: ClassVar[Dict[str, "LabeledFixtureFormat"]] = {}
 
-    def __init__(self, fixture_format: "Type[BaseFixture] | LabeledFixtureFormat", label: str):
+    def __init__(
+        self,
+        fixture_format: "Type[BaseFixture] | LabeledFixtureFormat",
+        label: str,
+        description: str,
+    ):
         """Initialize the fixture format with a custom label."""
         self.format = (
             fixture_format.format
             if isinstance(fixture_format, LabeledFixtureFormat)
             else fixture_format
         )
         self.label = label
+        self.description = description
         if label not in LabeledFixtureFormat.registered_labels:
             LabeledFixtureFormat.registered_labels[label] = self
 

src/ethereum_test_specs/eof.py

@@ -236,6 +236,7 @@ class EOFTest(BaseTest):
         LabeledFixtureFormat(
             fixture_format,
             f"{fixture_format.format_name}_from_eof_test",
+            f"A {fixture_format.format_name} generated from an eof_test.",
         )
         for fixture_format in StateTest.supported_fixture_formats
     ]
@@ -244,6 +245,7 @@ class EOFTest(BaseTest):
         LabeledExecuteFormat(
             execute_format,
             f"{execute_format.format_name}_from_eof_test",
+            f"A {execute_format.format_name} generated from an eof_test.",
         )
         for execute_format in StateTest.supported_execute_formats
     ]
@@ -519,6 +521,7 @@ class EOFStateTest(EOFTest, Transaction):
         LabeledFixtureFormat(
             fixture_format,
             f"eof_{fixture_format.format_name}",
+            f"Tests that generate an EOF {fixture_format.format_name}.",
         )
         for fixture_format in StateTest.supported_fixture_formats
     ]
@@ -527,6 +530,7 @@ class EOFStateTest(EOFTest, Transaction):
         LabeledExecuteFormat(
             execute_format,
             f"eof_{execute_format.format_name}",
+            f"Tests that generate an EOF {execute_format.format_name}.",
         )
         for execute_format in StateTest.supported_execute_formats
     ]

src/ethereum_test_specs/state.py

@@ -54,6 +54,7 @@ class StateTest(BaseTest):
         LabeledFixtureFormat(
             fixture_format,
             f"{fixture_format.format_name}_from_state_test",
+            f"A {fixture_format.format_name} generated from a state_test",
         )
         for fixture_format in BlockchainTest.supported_fixture_formats
     ]

src/pytest_plugins/shared/execute_fill.py

@@ -42,7 +42,7 @@ def pytest_configure(config: pytest.Config):
         for label, labeled_fixture_format in LabeledFixtureFormat.registered_labels.items():
             config.addinivalue_line(
                 "markers",
-                (f"{label}: Custom label for {labeled_fixture_format.format.format_name}."),
+                (f"{label}: {labeled_fixture_format.description}"),
             )
     elif config.pluginmanager.has_plugin("pytest_plugins.execute.execute"):
         for execute_format in BaseExecute.formats.values():
@@ -53,7 +53,7 @@ def pytest_configure(config: pytest.Config):
         for label, labeled_execute_format in LabeledExecuteFormat.registered_labels.items():
             config.addinivalue_line(
                 "markers",
-                (f"{label}: Custom label for {labeled_execute_format.format.format_name}."),
+                (f"{label}: {labeled_execute_format.description}"),
             )
     else:
         raise Exception("Neither the filler nor the execute plugin is loaded.")