Clean up rebase

Author: treysp

sqlmesh/core/console.py

@@ -968,18 +968,16 @@ def update_promotion_progress(
             and snapshot.snapshot_id in snapshots_with_virtual_views
         ):
             if self.verbosity >= Verbosity.VERBOSE:
-                action_str = (
-                    ""
+                action_str = ""
                 if promoted:
                     action_str = (
                         "[yellow]updated[/yellow]"
                         if snapshot.previous_version
                         else "[green]created[/green]"
                     )
                 action_str = action_str or "[red]dropped[/red]"
-                ).ljust(len("promoted"))
                 self.promotion_progress.live.console.print(
-                    f"{snapshot.display_name(self.environment_naming_info, self.default_catalog if self.verbosity < Verbosity.VERY_VERBOSE else None, dialect=self.dialect).ljust(self.PROGRESS_BAR_COLUMN_WIDTHS['name'])} {action_str}"
+                    f"{snapshot.display_name(self.environment_naming_info, self.default_catalog if self.verbosity < Verbosity.VERY_VERBOSE else None, dialect=self.dialect).ljust(self.PROGRESS_BAR_COLUMN_WIDTHS['name'])} {action_str.ljust(7)}"
                 )
             self.promotion_progress.update(self.promotion_task, refresh=True, advance=1)
 

tests/cli/test_cli.py

@@ -295,7 +295,7 @@ def test_plan_verbose(runner, tmp_path):
     )
     assert_plan_success(result)
     assert "sqlmesh_example.seed_model                           created" in result.output
-    assert "sqlmesh_example.seed_model                           promoted" in result.output
+    assert "sqlmesh_example.full_model                           created" in result.output
 
 
 def test_plan_very_verbose(runner, tmp_path, copy_to_temp_path):

tests/integrations/jupyter/test_magics.py

@@ -303,12 +303,11 @@ def test_plan(
     )
     # TODO: Is this what we expect?
     assert text_output[2] == ""
-    assert text_output[4] == "✔ Virtual layer updated"
+    assert text_output[3] == "✔ Virtual layer updated"
     assert convert_all_html_output_to_tags(output) == [
         ["pre", "span"],
         ["pre"] + ["span"] * 5,
         ["pre"],
-        ["pre"],
         ["pre", "span"],
     ]