Fix unit tests and cli command

Author: pritishpai

src/databricks/labs/ucx/cli.py

@@ -239,6 +239,7 @@ def ensure_assessment_run(
             )
         else:
             logger.info(f"Starting assessment workflow in workspace: {workspace_id}")
+            deployed_workflows.run_workflow("assessment", skip_job_wait=run_as_collection)
             # If running for a collection, don't wait for each assessment job to finish as that will take a long time.
 
 

tests/unit/install/test_install.py

@@ -180,8 +180,9 @@ def test_writeable_dbfs(ws, tmp_path, mock_installation) -> None:
 
 
 def test_run_workflow_creates_proper_failure(ws, mocker, mock_installation_with_jobs):
-    def run_now(job_id, _job_parameters: dict[str, Any] | None = None):
+    def run_now(job_id, job_parameters: dict[str, Any] | None = None):
         assert job_id == 123
+        assert job_parameters is None
 
         def result():
             raise OperationFailed(...)
@@ -215,8 +216,9 @@ def result():
 
 
 def test_run_workflow_run_id_not_found(ws, mocker, mock_installation_with_jobs):
-    def run_now(job_id, _job_parameters: dict[str, Any] | None = None):
+    def run_now(job_id, job_parameters: dict[str, Any] | None = None):
         assert job_id == 123
+        assert job_parameters is None
 
         def result():
             raise OperationFailed(...)
@@ -246,8 +248,9 @@ def result():
 
 
 def test_run_workflow_creates_failure_from_mapping(ws, mocker, mock_installation, mock_installation_with_jobs):
-    def run_now(job_id, _job_parameters: dict[str, Any] | None = None):
+    def run_now(job_id, job_parameters: dict[str, Any] | None = None):
         assert job_id == 123
+        assert job_parameters is None
 
         def result():
             raise OperationFailed(...)
@@ -281,8 +284,9 @@ def result():
 
 
 def test_run_workflow_creates_failure_many_error(ws, mocker, mock_installation_with_jobs):
-    def run_now(job_id, _job_parameters: dict[str, Any] | None = None):
+    def run_now(job_id, job_parameters: dict[str, Any] | None = None):
         assert job_id == 123
+        assert job_parameters is None
 
         def result():
             raise OperationFailed(...)

tests/unit/installer/test_workflows.py

@@ -87,7 +87,7 @@ def test_run_workflow(mock_installation) -> None:
     run_id = workflows.run_workflow("test")
 
     assert run_id == 456
-    ws.jobs.run_now.assert_called_once_with(123)
+    ws.jobs.run_now.assert_called_once_with(123, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.assert_called_once_with(run_id=456, timeout=timedelta(minutes=20))
 
 
@@ -101,7 +101,7 @@ def test_run_workflow_skip_job_wait(mock_installation) -> None:
     run_id = workflows.run_workflow("test", skip_job_wait=True)
 
     assert run_id == 456
-    ws.jobs.run_now.assert_called_once_with(123)
+    ws.jobs.run_now.assert_called_once_with(123, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.assert_not_called()
 
 
@@ -121,7 +121,7 @@ def test_run_workflow_operation_failed(mock_installation) -> None:
     with pytest.raises(NotFound, match="a_table"):
         _ = workflows.run_workflow("test")
 
-    ws.jobs.run_now.assert_called_once_with(123)
+    ws.jobs.run_now.assert_called_once_with(123, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.assert_called_once_with(run_id=456, timeout=timedelta(minutes=20))
     ws.jobs.get_run.assert_called_once_with(456)
     ws.workspace.list.assert_called_once_with("~/mock/logs/test")
@@ -139,6 +139,6 @@ def test_run_workflow_timeout(mock_installation) -> None:
     with pytest.raises(TimeoutError):
         _ = workflows.run_workflow("test", max_wait=timedelta(minutes=2))
 
-    ws.jobs.run_now.assert_called_once_with(123)
+    ws.jobs.run_now.assert_called_once_with(123, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.assert_called_once_with(run_id=456, timeout=timedelta(minutes=2))
     ws.workspace.list.assert_called_once_with("~/mock/logs/test")

tests/unit/test_cli.py

@@ -406,7 +406,7 @@ def test_ensure_assessment_run_collection(workspace_clients, acc_client):
     ensure_assessment_run(workspace_clients[0], run_as_collection=True, a=acc_client)
 
     for workspace_client in workspace_clients:
-        workspace_client.jobs.run_now.assert_called_with(123)
+        workspace_client.jobs.run_now.assert_called_with(123, job_parameters=None)
 
 
 def test_repair_run(ws):
@@ -1035,7 +1035,7 @@ def test_migrate_tables_calls_migrate_table_job_run_now(
     migrate_tables(workspace_clients[0], MockPrompts({}), run_as_collection=run_as_collection, a=acc_client)
 
     for workspace_client in workspace_clients:
-        workspace_client.jobs.run_now.assert_called_with(456)
+        workspace_client.jobs.run_now.assert_called_with(456, job_parameters=None)
         workspace_client.jobs.wait_get_run_job_terminated_or_skipped.assert_called_once()
 
 
@@ -1079,7 +1079,7 @@ def test_migrate_tables_calls_external_hiveserde_tables_job_run_now(ws) -> None:
 
     migrate_tables(ws, prompts, ctx=ctx)
 
-    ws.jobs.run_now.assert_called_with(789)
+    ws.jobs.run_now.assert_called_with(789, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.call_count = 2
 
 
@@ -1114,7 +1114,7 @@ def test_migrate_tables_calls_external_tables_ctas_job_run_now(ws) -> None:
 
     migrate_tables(ws, prompts, ctx=ctx)
 
-    ws.jobs.run_now.assert_called_with(987)
+    ws.jobs.run_now.assert_called_with(987, job_parameters=None)
     ws.jobs.wait_get_run_job_terminated_or_skipped.call_count = 2