Applied PR review feedback.

databrickslabs · Feb 8, 2024 · 156dfd8 · 156dfd8
1 parent 064b8ed
commit 156dfd8
Showing 1 changed file with 10 additions and 7 deletions.
diff --git a/tests/unit/test_install.py b/tests/unit/test_install.py
@@ -890,7 +890,6 @@ def test_latest_job_status_states(ws, mock_installation_with_jobs, any_prompt, s
     workspace_installation = WorkspaceInstallation(
         config, mock_installation_with_jobs, sql_backend, wheels, ws, any_prompt, timeout
     )
-    workspace_installation._state.jobs = {"assessment": "123"}
     ws.jobs.list_runs.return_value = base
     status = workspace_installation.latest_job_status()
     assert len(status) == 1
@@ -903,6 +902,7 @@ def test_latest_job_status_states(ws, mock_installation_with_jobs, any_prompt, s
     [
         (1704114000000, "1 hour ago"),  # 2024-01-01 13:00:00
         (1704117600000, "less than 1 second ago"),  # 2024-01-01 14:00:00
+        (1704116990000, "10 minutes 10 seconds ago"),  # 2024-01-01 13:49:50
         (None, "<never run>"),
     ],
 )
@@ -927,15 +927,14 @@ def test_latest_job_status_success_with_time(
     workspace_installation = WorkspaceInstallation(
         config, mock_installation_with_jobs, sql_backend, wheels, ws, any_prompt, timeout
     )
-    workspace_installation._state.jobs = {"assessment": "123"}
     ws.jobs.list_runs.return_value = base
     faked_now = datetime(2024, 1, 1, 14, 0, 0)
     mock_datetime.now.return_value = faked_now
     status = workspace_installation.latest_job_status()
     assert status[0]["started"] == expected
 
 
-def test_latest_job_status_list(ws, mock_installation_with_jobs, any_prompt):
+def test_latest_job_status_list(ws, any_prompt):
     runs = [
         [
             BaseRun(
@@ -965,10 +964,16 @@ def test_latest_job_status_list(ws, mock_installation_with_jobs, any_prompt):
     wheels = create_autospec(WheelsV2)
     config = WorkspaceConfig(inventory_database='ucx')
     timeout = timedelta(seconds=1)
+    mock_installation = MockInstallation(
+        {
+            'state.json': {
+                'resources': {'jobs': {"job1": "1", "job2": "2", "job3": "3"}}
+            }
+        }
+    )
     workspace_installation = WorkspaceInstallation(
-        config, mock_installation_with_jobs, sql_backend, wheels, ws, any_prompt, timeout
+        config, mock_installation, sql_backend, wheels, ws, any_prompt, timeout
     )
-    workspace_installation._state.jobs = {"job1": "1", "job2": "2", "job3": "3"}
     ws.jobs.list_runs.side_effect = iter(runs)
     status = workspace_installation.latest_job_status()
     assert len(status) == 3
@@ -988,7 +993,6 @@ def test_latest_job_status_no_job_run(ws, mock_installation_with_jobs, any_promp
     workspace_installation = WorkspaceInstallation(
         config, mock_installation_with_jobs, sql_backend, wheels, ws, any_prompt, timeout
     )
-    workspace_installation._state.jobs = {"assessment": "123"}
     ws.jobs.list_runs.return_value = ""
     status = workspace_installation.latest_job_status()
     assert len(status) == 1
@@ -1003,7 +1007,6 @@ def test_latest_job_status_exception(ws, mock_installation_with_jobs, any_prompt
     workspace_installation = WorkspaceInstallation(
         config, mock_installation_with_jobs, sql_backend, wheels, ws, any_prompt, timeout
     )
-    workspace_installation._state.jobs = {"assessment": "123"}
     ws.jobs.list_runs.side_effect = InvalidParameterValue("Workflow does not exists")
     status = workspace_installation.latest_job_status()
     assert len(status) == 0