PR Feedback 1

Author: VaggelisD

sqlmesh/core/context.py

@@ -1780,10 +1780,11 @@ def test(
         if verbosity >= Verbosity.VERBOSE:
             pd.set_option("display.max_columns", None)
 
-        default_gateway = self.gateway or self.config.default_gateway_name
-
         # Merge the root variables with the gateway's variables
-        variables = {**self.config.variables, **self.config.get_gateway(default_gateway).variables}
+        variables = {
+            **self.config.variables,
+            **self.config.get_gateway(self.selected_gateway).variables,
+        }
 
         test_meta = load_model_tests(
             configs=self.configs,
@@ -1796,7 +1797,7 @@ def test(
             model_test_metadata=test_meta,
             models=self._models,
             config=self.config,
-            default_gateway=default_gateway,
+            selected_gateway=self.selected_gateway,
             dialect=self.default_dialect,
             verbosity=verbosity,
             preserve_fixtures=preserve_fixtures,

sqlmesh/core/test/runner.py

@@ -47,15 +47,15 @@ def __init__(
 def create_testing_engine_adapters(
     model_test_metadata: list[ModelTestMetadata],
     config: C,
-    default_gateway: str,
+    selected_gateway: str,
     default_catalog: str | None = None,
     default_catalog_dialect: str = "",
 ) -> t.Dict[ModelTestMetadata, EngineAdapter]:
     testing_adapter_by_gateway: t.Dict[str, EngineAdapter] = {}
     metadata_to_adapter = {}
 
     for metadata in model_test_metadata:
-        gateway = metadata.body.get("gateway") or default_gateway
+        gateway = metadata.body.get("gateway") or selected_gateway
         test_connection = config.get_test_connection(
             gateway, default_catalog, default_catalog_dialect
         )
@@ -85,7 +85,7 @@ def run_tests(
     model_test_metadata: list[ModelTestMetadata],
     models: UniqueKeyDict[str, Model],
     config: C,
-    default_gateway: str,
+    selected_gateway: str,
     dialect: str | None = None,
     verbosity: Verbosity = Verbosity.DEFAULT,
     preserve_fixtures: bool = False,
@@ -102,7 +102,7 @@ def run_tests(
         preserve_fixtures: Preserve the fixture tables in the testing database, useful for debugging.
     """
     default_test_connection = config.get_test_connection(
-        gateway_name=default_gateway,
+        gateway_name=selected_gateway,
         default_catalog=default_catalog,
         default_catalog_dialect=default_catalog_dialect,
     )
@@ -118,47 +118,47 @@ def run_tests(
     metadata_to_adapter = create_testing_engine_adapters(
         model_test_metadata=model_test_metadata,
         config=config,
-        default_gateway=default_gateway,
+        selected_gateway=selected_gateway,
         default_catalog=default_catalog,
         default_catalog_dialect=default_catalog_dialect,
     )
 
     def _run_single_test(
         metadata: ModelTestMetadata, engine_adapter: EngineAdapter
     ) -> t.Optional[ModelTextTestResult]:
-        result: t.Optional[ModelTextTestResult] = None
-        try:
-            test = ModelTest.create_test(
-                body=metadata.body,
-                test_name=metadata.test_name,
-                models=models,
-                engine_adapter=engine_adapter,
-                dialect=dialect,
-                path=metadata.path,
-                default_catalog=default_catalog,
-                preserve_fixtures=preserve_fixtures,
-            )
+        test = ModelTest.create_test(
+            body=metadata.body,
+            test_name=metadata.test_name,
+            models=models,
+            engine_adapter=engine_adapter,
+            dialect=dialect,
+            path=metadata.path,
+            default_catalog=default_catalog,
+            preserve_fixtures=preserve_fixtures,
+        )
 
-            result = t.cast(
-                ModelTextTestResult,
-                ModelTextTestRunner().run(t.cast(unittest.TestCase, test)),
-            )
+        if not test:
+            return None
+
+        result = t.cast(
+            ModelTextTestResult,
+            ModelTextTestRunner().run(t.cast(unittest.TestCase, test)),
+        )
+
+        with lock:
+            if result.successes:
+                combined_results.addSuccess(result.successes[0])
+            elif result.errors:
+                combined_results.addError(result.original_err[0], result.original_err[1])
+            elif result.failures:
+                combined_results.addFailure(result.original_err[0], result.original_err[1])
+            elif result.skipped:
+                skipped_args = result.skipped[0]
+                combined_results.addSkip(skipped_args[0], skipped_args[1])
+
+            combined_results.testsRun += 1
 
-            with lock:
-                if result.successes:
-                    combined_results.addSuccess(result.successes[0])
-                elif result.errors:
-                    combined_results.addError(result.original_err[0], result.original_err[1])
-                elif result.failures:
-                    combined_results.addFailure(result.original_err[0], result.original_err[1])
-                elif result.skipped:
-                    skipped_args = result.skipped[0]
-                    combined_results.addSkip(skipped_args[0], skipped_args[1])
-
-                combined_results.testsRun += 1
-
-        finally:
-            return result
+        return result
 
     test_results = []
 

tests/core/test_test.py

@@ -1619,7 +1619,7 @@ def test_variable_usage(tmp_path: Path) -> None:
     # Case 2: Test gateway variables
     context.config = Config(
         gateways={
-            "main": GatewayConfig(connection=DuckDBConnectionConfig(), variables=variables),
+            "": GatewayConfig(connection=DuckDBConnectionConfig(), variables=variables),
         },
         model_defaults=ModelDefaultsConfig(dialect="duckdb"),
     )
@@ -1633,7 +1633,7 @@ def test_variable_usage(tmp_path: Path) -> None:
     # Case 3: Test gateway variables overriding root variables
     context.config = Config(
         gateways={
-            "main": GatewayConfig(connection=DuckDBConnectionConfig(), variables=variables),
+            "": GatewayConfig(connection=DuckDBConnectionConfig(), variables=variables),
         },
         model_defaults=ModelDefaultsConfig(dialect="duckdb"),
         variables={"gold": "foo", "silver": "bar"},