more test fixes

Author: EmmaLRussell

src/packit_client.py

@@ -112,7 +112,8 @@ def do_refresh_git():
 
     def run(self, packet_group, parameters):
         def do_run():
-            branch = "main"
+            # TODO: REVERT THIS!!!
+            branch =  "mrc-6454-add-delay-to-diagnostic" #"main"
             commit = self.__get_latest_commit_for_branch(branch)
             data = {
                 "name": packet_group,

src/packit_client_exception.py

@@ -5,5 +5,6 @@ def __init__(self, response):
         msg = "Unexpected response status from Packit API: " + \
             f"{response.status_code}."
         if "error" in json and "detail" in json["error"]:
-            msg = f"{msg} Detail: {json["error"]["detail"]}"
+            detail = json["error"]["detail"]
+            msg = f"{msg} Detail: {detail}"
         super().__init__(msg)

test/integration/test_worker.py

@@ -6,7 +6,7 @@
 
 from src.config import Config
 from src.utils.running_reports_repository import RunningReportsRepository
-from src.orderlyweb_client_wrapper import OrderlyWebClientWrapper
+from src.packit_client import PackitClient
 from test.integration.yt_utils import YouTrackUtils
 from test.integration.file_utils import write_text_file
 
@@ -68,12 +68,11 @@ def test_later_task_kills_earlier_task_report():
 
     assert len(versions) == 2
 
-    # Check first report key's status with OrderlyWeb - should have been killed
+    # Check first report key's status with Packit - should have been killed
     config = Config()
-    wrapper = OrderlyWebClientWrapper(config)
-    result = wrapper.execute(wrapper.ow.report_status, first_report_key)
-    assert result.status == "interrupted"
-    assert result.finished
+    packit = PackitClient(config)
+    result = packit.poll(first_report_key)
+    assert result["status"] == "CANCELLED"
 
     # Check redis key has been tidied up
     assert running_repo.get("testGroup", "testDisease", "diagnostic") is None

test/unit/test_run_reports.py

@@ -1,8 +1,6 @@
 from src.utils.run_reports import run_reports
 from src.config import ReportConfig
-from orderlyweb_api import ReportStatusResult
 from unittest.mock import patch, call, Mock
-from src.orderlyweb_client_wrapper import OrderlyWebClientWrapper
 
 reports = [ReportConfig("r1", None, ["r1@example.com"], "Subj: r1",
                         "a.ssignee", ["Funders"]),