Fix tests

Author: treysp

tests/core/test_integration.py

@@ -1950,13 +1950,16 @@ def test_snapshot_triggers(init_and_plan_context: t.Callable, mocker: MockerFixt
         for k, v in actual_triggers.items()
         if v.restatement_triggers
     }
-    assert actual_triggers_name == {
-        waiter_revenue_by_day_name: [waiter_revenue_by_day_name, order_items_name],
-        order_items_name: [order_items_name],
-        '"memory"."sushi"."top_waiters"': [waiter_revenue_by_day_name],
-        '"memory"."sushi"."customer_revenue_by_day"': [order_items_name],
-        '"memory"."sushi"."customer_revenue_lifetime"': [order_items_name],
-    }
+
+    assert sorted(actual_triggers_name[waiter_revenue_by_day_name]) == sorted(
+        [waiter_revenue_by_day_name, order_items_name]
+    )
+    assert actual_triggers_name[order_items_name] == [order_items_name]
+    assert actual_triggers_name['"memory"."sushi"."top_waiters"'] == [waiter_revenue_by_day_name]
+    assert actual_triggers_name['"memory"."sushi"."customer_revenue_by_day"'] == [order_items_name]
+    assert actual_triggers_name['"memory"."sushi"."customer_revenue_lifetime"'] == [
+        order_items_name
+    ]
 
     # RUN: select and auto-restatement triggers
     # User selects top_waiters and waiter_revenue_by_day, others added as auto-upstream
@@ -7110,7 +7113,17 @@ def plan_with_output(ctx: Context, environment: str):
     assert "New environment `dev` will be created from `prod`" in output.stdout
     assert "Differences from the `prod` environment" in output.stdout
 
-    assert "Directly Modified: test__dev.a" in output.stdout
+    assert (
+        """MODEL (
+   name test.a,
++  owner test,
+   kind FULL
+ )
+ SELECT
+-  5 AS col
++  10 AS col"""
+        in output.stdout
+    )
 
     # Case 6: Ensure that target environment and create_from environment are not the same
     output = plan_with_output(ctx, "prod")

tests/core/test_scheduler.py

@@ -59,7 +59,10 @@ def test_interval_params(scheduler: Scheduler, sushi_context_fixed_date: Context
     start_ds = "2022-01-01"
     end_ds = "2022-02-05"
 
-    assert compute_interval_params([orders, waiter_revenue], start=start_ds, end=end_ds) == {
+    interval_params, _ = compute_interval_params(
+        [orders, waiter_revenue], start=start_ds, end=end_ds
+    )
+    assert interval_params == {
         orders: [
             (to_timestamp(start_ds), to_timestamp("2022-02-06")),
         ],
@@ -91,7 +94,8 @@ def test_interval_params_nonconsecutive(scheduler: Scheduler, orders: Snapshot):
 
     orders.add_interval("2022-01-10", "2022-01-15")
 
-    assert compute_interval_params([orders], start=start_ds, end=end_ds) == {
+    interval_params, _ = compute_interval_params([orders], start=start_ds, end=end_ds)
+    assert interval_params == {
         orders: [
             (to_timestamp(start_ds), to_timestamp("2022-01-10")),
             (to_timestamp("2022-01-16"), to_timestamp("2022-02-06")),