catch up with changes on main

Author: aaronsteers

airbyte_cdk/test/standard_tests/connector_base.py

@@ -8,11 +8,8 @@
 from pathlib import Path
 from typing import TYPE_CHECKING, cast
 
-import yaml
-from airbyte_protocol_dataclasses.models.airbyte_protocol import AirbyteConnectionStatus
 from boltons.typeutils import classproperty
 
-from airbyte_cdk.models import Status
 from airbyte_cdk.test import entrypoint_wrapper
 from airbyte_cdk.test.models import (
     ConnectorTestScenario,
@@ -121,74 +118,6 @@ def test_check(
             connector_root=self.get_connector_root_dir(),
         )
         assert len(result.connection_status_messages) == 1, (
-            f"Expected exactly one CONNECTION_STATUS message. Got {len(result.connection_status_messages)}: \n"
-            + "\n".join([str(m) for m in result._messages or []])
-            + "\nErrors: "
-            + str(result.errors)
-            or "None"
+            f"Expected exactly one CONNECTION_STATUS message. "
+            "Got: {result.connection_status_messages!s}"
         )
-        conn_status = cast(
-            AirbyteConnectionStatus, result.connection_status_messages[0].connectionStatus
-        )
-        if (
-            scenario.expected_outcome.expect_exception()
-            and conn_status.status == Status.SUCCEEDED
-            and not result.errors
-        ):
-            raise AssertionError(f"Expected error in `check` but got success.")
-
-    @classmethod
-    def get_connector_root_dir(cls) -> Path:
-        """Get the root directory of the connector."""
-        return find_connector_root([cls.get_test_class_dir(), Path.cwd()])
-
-    @classproperty
-    def acceptance_test_config_path(cls) -> Path:
-        """Get the path to the acceptance test config file."""
-        result = cls.get_connector_root_dir() / ACCEPTANCE_TEST_CONFIG
-        if result.exists():
-            return result
-
-        raise FileNotFoundError(f"Acceptance test config file not found at: {str(result)}")
-
-    @classmethod
-    def get_scenarios(
-        cls,
-    ) -> list[ConnectorTestScenario]:
-        """Get acceptance tests for a given category.
-
-        This has to be a separate function because pytest does not allow
-        parametrization of fixtures with arguments from the test class itself.
-        """
-        categories = ["connection", "spec"]
-        all_tests_config = yaml.safe_load(cls.acceptance_test_config_path.read_text())
-        if "acceptance_tests" not in all_tests_config:
-            raise ValueError(
-                f"Acceptance tests config not found in {cls.acceptance_test_config_path}."
-                f" Found only: {str(all_tests_config)}."
-            )
-
-        test_scenarios: list[ConnectorTestScenario] = []
-        for category in categories:
-            if (
-                category not in all_tests_config["acceptance_tests"]
-                or "tests" not in all_tests_config["acceptance_tests"][category]
-            ):
-                continue
-
-            test_scenarios.extend(
-                [
-                    ConnectorTestScenario.model_validate(test)
-                    for test in all_tests_config["acceptance_tests"][category]["tests"]
-                    if "config_path" in test and "iam_role" not in test["config_path"]
-                ]
-            )
-
-        connector_root = cls.get_connector_root_dir().absolute()
-        for test in test_scenarios:
-            if test.config_path:
-                test.config_path = connector_root / test.config_path
-            if test.configured_catalog_path:
-                test.configured_catalog_path = connector_root / test.configured_catalog_path
-
-        return test_scenarios