Fix rest_api_spec xfail mechanism

Not only the file names were an issue, but passing strict to xfail can
only be done in the configuration.

Author: pquentin

pyproject.toml

@@ -101,6 +101,7 @@ packages = ["elasticsearch_serverless"]
 [tool.pytest]
 junit_family = "legacy"
 addopts = "-vvv -p no:logging --cov-report=term-missing --cov=elasticsearch_serverless --cov-config=.pyproject.toml"
+xfail_strict=true
 
 [tool.isort]
 profile = "black"

test_elasticsearch_serverless/test_server/test_rest_api_spec.py

@@ -554,11 +554,11 @@ def remove_implicit_resolver(cls, tag_to_remove):
         # Now we combine setup, teardown, and test_steps into
         # a set of pytest.param() instances
         for test_number, test_step in test_numbers_and_steps:
-            # Build the id from the name of the YAML file and
-            # the number within that file. Most important step
-            # is to remove most of the file path prefixes and
-            # the .yml suffix.
-            pytest_test_name = yaml_file.rpartition(".")[0].replace(".", "/")
+            # Build the id from the name of the YAML file and the number within
+            # that file. Most important step is to remove most of the file path
+            # prefixes and the .yml suffix.
+            test_path = "/".join(yaml_file.split("/")[2:])
+            pytest_test_name = test_path.rpartition(".")[0].replace(".", "/")
             for prefix in ("rest-api-spec/", "test/", "free/", "platinum/"):
                 if pytest_test_name.startswith(prefix):
                     pytest_test_name = pytest_test_name[len(prefix) :]
@@ -592,6 +592,6 @@ def _pytest_param_sort_key(param: pytest.param) -> Tuple[Union[str, int], ...]:
     @pytest.mark.parametrize("test_spec", YAML_TEST_SPECS)
     def test_rest_api_spec(test_spec, sync_runner):
         if test_spec.get("fail", False):
-            pytest.xfail("Manually marked as failing in 'FAILING_TESTS'", strict=True)
+            pytest.xfail("Manually marked as failing in 'FAILING_TESTS'")
         sync_runner.use_spec(test_spec)
         sync_runner.run()