Remove unused variable, fix test

Author: VaggelisD

sqlmesh/core/context.py

@@ -2337,9 +2337,7 @@ def _run_janitor(self, ignore_ttl: bool = False) -> None:
         # Clean up expired environments by removing their views and schemas
         self._cleanup_environments()
 
-        expired_snapshot_ids, cleanup_targets = self.state_sync.get_expired_snapshots(
-            ignore_ttl=ignore_ttl
-        )
+        _, cleanup_targets = self.state_sync.get_expired_snapshots(ignore_ttl=ignore_ttl)
 
         # Remove the expired snapshots tables
         self.snapshot_evaluator.cleanup(

tests/core/test_context.py

@@ -43,6 +43,7 @@
 from sqlmesh.utils.date import (
     make_inclusive_end,
     now,
+    now_timestamp,
     to_date,
     to_timestamp,
     yesterday_ds,
@@ -775,29 +776,40 @@ def test_janitor(sushi_context, mocker: MockerFixture) -> None:
     adapter_mock.dialect = "duckdb"
     state_sync_mock = mocker.MagicMock()
 
-    state_sync_mock.delete_expired_environments.return_value = [
-        Environment(
-            name="test_environment",
-            suffix_target=EnvironmentSuffixTarget.TABLE,
-            snapshots=[x.table_info for x in sushi_context.snapshots.values()],
-            start_at="2022-01-01",
-            end_at="2022-01-01",
-            plan_id="test_plan_id",
-            previous_plan_id="test_plan_id",
-        ),
-        Environment(
-            name="test_environment",
-            suffix_target=EnvironmentSuffixTarget.SCHEMA,
-            snapshots=[x.table_info for x in sushi_context.snapshots.values()],
-            start_at="2022-01-01",
-            end_at="2022-01-01",
-            plan_id="test_plan_id",
-            previous_plan_id="test_plan_id",
-        ),
-    ]
+    now_ts = now_timestamp()
+    filter_expr = exp.LTE(
+        this=exp.column("expiration_ts"),
+        expression=exp.Literal.number(now_ts),
+    )
+
+    state_sync_mock.get_expired_environments.return_value = (
+        [
+            Environment(
+                name="test_environment",
+                suffix_target=EnvironmentSuffixTarget.TABLE,
+                snapshots=[x.table_info for x in sushi_context.snapshots.values()],
+                start_at="2022-01-01",
+                end_at="2022-01-01",
+                plan_id="test_plan_id",
+                previous_plan_id="test_plan_id",
+            ),
+            Environment(
+                name="test_environment",
+                suffix_target=EnvironmentSuffixTarget.SCHEMA,
+                snapshots=[x.table_info for x in sushi_context.snapshots.values()],
+                start_at="2022-01-01",
+                end_at="2022-01-01",
+                plan_id="test_plan_id",
+                previous_plan_id="test_plan_id",
+            ),
+        ],
+        filter_expr,
+    )
 
     sushi_context._engine_adapters = {sushi_context.config.default_gateway: adapter_mock}
     sushi_context._state_sync = state_sync_mock
+    state_sync_mock.get_expired_snapshots.return_value = (set({}), [])
+
     sushi_context._run_janitor()
     # Assert that the schemas are dropped just twice for the schema based environment
     # Make sure that external model schemas/tables are not dropped