Fix

Author: erindru

tests/core/engine_adapter/integration/conftest.py

@@ -105,17 +105,26 @@ def _create(
             gateway,
             is_remote=is_remote,
         )
-        ctx.init()
-
-        with ctx.engine_adapter.session({}):
-            yield ctx
 
+        skip = False
         try:
-            ctx.cleanup()
+            ctx.init()
         except Exception:
-            # We need to catch this exception because if there is an error during teardown, pytest-retry aborts immediately
+            # We need to catch this exception because if there is an error during setup, pytest-retry aborts immediately
             # instead of retrying
-            logger.exception("Context cleanup failed")
+            logger.exception("Context init failed")
+            skip = True
+
+        if not skip:
+            with ctx.engine_adapter.session({}):
+                yield ctx
+
+            try:
+                ctx.cleanup()
+            except Exception:
+                # We need to catch this exception because if there is an error during teardown, pytest-retry aborts immediately
+                # instead of retrying
+                logger.exception("Context cleanup failed")
 
     return _create
 

tests/core/engine_adapter/integration/test_integration_athena.py

@@ -7,6 +7,7 @@
 from sqlmesh.utils.aws import parse_s3_uri
 from sqlmesh.utils.pandas import columns_to_types_from_df
 from sqlmesh.utils.date import to_ds, to_ts, TimeLike
+import dataclasses
 from tests.core.engine_adapter.integration import (
     TestContext,
     generate_pytest_params,
@@ -15,8 +16,12 @@
 )
 from sqlglot import exp
 
+# The tests in this file dont need to be called twice, so we create a single instance of Athena
+ENGINE_ATHENA = dataclasses.replace(ENGINES_BY_NAME["athena"], catalog_types=None)
+assert isinstance(ENGINE_ATHENA, IntegrationTestEngine)
 
-@pytest.fixture(params=list(generate_pytest_params(ENGINES_BY_NAME["athena"])))
+
+@pytest.fixture(params=list(generate_pytest_params(ENGINE_ATHENA)))
 def ctx(
     request: FixtureRequest,
     create_test_context: t.Callable[[IntegrationTestEngine, str, str], t.Iterable[TestContext]],