From 026c6cde6c728e8e78ced1c8d8d92186d520acfc Mon Sep 17 00:00:00 2001
From: Fenimore Love <fenimore.love@dashlane.com>
Date: Thu, 6 Mar 2025 08:00:04 -0500
Subject: [PATCH 1/2] Try with completed

---
 tableauserverclient/models/job_item.py               | 1 +
 tableauserverclient/server/endpoint/jobs_endpoint.py | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/tableauserverclient/models/job_item.py b/tableauserverclient/models/job_item.py
index 6286275c5..d650eb846 100644
--- a/tableauserverclient/models/job_item.py
+++ b/tableauserverclient/models/job_item.py
@@ -82,6 +82,7 @@ class FinishCode:
         Success: int = 0
         Failed: int = 1
         Cancelled: int = 2
+        Completed: int = 3
 
     def __init__(
         self,
diff --git a/tableauserverclient/server/endpoint/jobs_endpoint.py b/tableauserverclient/server/endpoint/jobs_endpoint.py
index 027a7ca12..3c10d582d 100644
--- a/tableauserverclient/server/endpoint/jobs_endpoint.py
+++ b/tableauserverclient/server/endpoint/jobs_endpoint.py
@@ -188,7 +188,7 @@ def wait_for_job(self, job_id: Union[str, JobItem], *, timeout: Optional[float]
 
         logger.info(f"Job {job_id} Completed: Finish Code: {job.finish_code} - Notes:{job.notes}")
 
-        if job.finish_code == JobItem.FinishCode.Success:
+        if job.finish_code == JobItem.FinishCode.Success or job.finish_code == JobItem.FinishCode.Completed:
             return job
         elif job.finish_code == JobItem.FinishCode.Failed:
             raise JobFailedException(job)

From 65ac5cb2bc10cd0432260e5517ca56ab658c1894 Mon Sep 17 00:00:00 2001
From: Fenimore Love <fenimore.love@dashlane.com>
Date: Thu, 6 Mar 2025 08:06:11 -0500
Subject: [PATCH 2/2] Add completed unittest

---
 test/assets/job_get_by_id_completed.xml | 14 ++++++++++++++
 test/test_job.py                        | 13 +++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 test/assets/job_get_by_id_completed.xml

diff --git a/test/assets/job_get_by_id_completed.xml b/test/assets/job_get_by_id_completed.xml
new file mode 100644
index 000000000..1e26d022c
--- /dev/null
+++ b/test/assets/job_get_by_id_completed.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<tsResponse xmlns="http://tableau.com/api" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="http://tableau.com/api http://tableau.com/api/ts-api-3.1.xsd">
+    <job id="2eef4225-aa0c-41c4-8662-a76d89ed7336" mode="job-mode" type="extractRefreshJob"
+         progress="100"     createdAt="2020-05-13T20:23:45Z"     updatedAt="2020-05-13T20:25:18Z"
+         completedAt="2020-05-13T20:25:18Z"     finishCode="3">
+        <extractRefreshJob>
+            <notes>Job detail notes</notes>
+        </extractRefreshJob>
+        <statusNotes>
+            <statusNote type="CountOfUsersAddedToGroup" value="5" text="Description of how many users were added to the group during the import." />More detail
+        </statusNotes>
+    </job>
+</tsResponse>
diff --git a/test/test_job.py b/test/test_job.py
index 20b238764..e686490ab 100644
--- a/test/test_job.py
+++ b/test/test_job.py
@@ -11,6 +11,7 @@
 
 GET_XML = "job_get.xml"
 GET_BY_ID_XML = "job_get_by_id.xml"
+GET_BY_ID_COMPLETED_XML = "job_get_by_id_completed.xml"
 GET_BY_ID_FAILED_XML = "job_get_by_id_failed.xml"
 GET_BY_ID_CANCELLED_XML = "job_get_by_id_cancelled.xml"
 GET_BY_ID_INPROGRESS_XML = "job_get_by_id_inprogress.xml"
@@ -87,6 +88,18 @@ def test_wait_for_job_finished(self) -> None:
             self.assertEqual(job_id, job.id)
             self.assertListEqual(job.notes, ["Job detail notes"])
 
+    def test_wait_for_job_completed(self) -> None:
+        # Waiting for a bridge (cloud) job completion
+        response_xml = read_xml_asset(GET_BY_ID_COMPLETED_XML)
+        job_id = "2eef4225-aa0c-41c4-8662-a76d89ed7336"
+        with mocked_time(), requests_mock.mock() as m:
+            m.get(f"{self.baseurl}/{job_id}", text=response_xml)
+            job = self.server.jobs.wait_for_job(job_id)
+
+            self.assertEqual(job_id, job.id)
+            self.assertListEqual(job.notes, ["Job detail notes"])
+
+
     def test_wait_for_job_failed(self) -> None:
         # Waiting for a failed job raises an exception
         response_xml = read_xml_asset(GET_BY_ID_FAILED_XML)