feat: pass retry from Job.result() to Job.done()

google/cloud/bigquery/job.py

@@ -817,8 +817,9 @@ def result(self, retry=DEFAULT_RETRY, timeout=None):
         """
         if self.state is None:
             self._begin(retry=retry, timeout=timeout)
-        # TODO: modify PollingFuture so it can pass a retry argument to done().
-        return super(_AsyncJob, self).result(timeout=timeout)
+
+        kwargs = {} if retry is DEFAULT_RETRY else {"retry": retry}
+        return super(_AsyncJob, self).result(timeout=timeout, **kwargs)
 
     def cancelled(self):
         """Check if the job has been cancelled.
@@ -1843,7 +1844,7 @@ def destination(self):
         """
         return TableReference.from_api_repr(
             _helpers._get_sub_prop(
-                self._properties, ["configuration", "copy", "destinationTable"],
+                self._properties, ["configuration", "copy", "destinationTable"]
             )
         )
 
@@ -2041,10 +2042,7 @@ def __init__(self, job_id, source, destination_uris, client, job_config=None):
         self._configuration = job_config
 
         if source:
-            source_ref = {
-                "projectId": source.project,
-                "datasetId": source.dataset_id,
-            }
+            source_ref = {"projectId": source.project, "datasetId": source.dataset_id}
 
             if isinstance(source, (Table, TableListItem, TableReference)):
                 source_ref["tableId"] = source.table_id

tests/unit/test_job.py

@@ -851,7 +851,7 @@ def test_cancel_w_custom_retry(self):
         job = self._set_properties_job()
 
         api_request_patcher = mock.patch.object(
-            job._client._connection, "api_request", side_effect=[ValueError, response],
+            job._client._connection, "api_request", side_effect=[ValueError, response]
         )
         retry = DEFAULT_RETRY.with_deadline(1).with_predicate(
             lambda exc: isinstance(exc, ValueError)
@@ -872,7 +872,7 @@ def test_cancel_w_custom_retry(self):
             [
                 mock.call(method="POST", path=api_path, query_params={}, timeout=7.5),
                 mock.call(
-                    method="POST", path=api_path, query_params={}, timeout=7.5,
+                    method="POST", path=api_path, query_params={}, timeout=7.5
                 ),  # was retried once
             ],
         )
@@ -988,7 +988,16 @@ def test_result_w_retry_wo_state(self, result):
         self.assertIs(job.result(retry=retry), result.return_value)
 
         begin.assert_called_once_with(retry=retry, timeout=None)
-        result.assert_called_once_with(timeout=None)
+        result.assert_called_once_with(retry=retry, timeout=None)
+
+    def test_result_retry_to_done(self):
+        client = _make_client(project=self.PROJECT)
+        job = self._make_one(self.JOB_ID, client)
+        done = job.done = mock.Mock()
+        retry = mock.Mock()
+
+        job.result(retry=retry)
+        done.assert_called_once_with(retry=retry, timeout=None)
 
     @mock.patch("google.api_core.future.polling.PollingFuture.result")
     def test_result_explicit_w_state(self, result):
@@ -2692,7 +2701,7 @@ def test_cancel_w_bound_client(self):
         final_attributes.assert_called_with({"path": PATH}, client, job)
 
         conn.api_request.assert_called_once_with(
-            method="POST", path=PATH, query_params={}, timeout=None,
+            method="POST", path=PATH, query_params={}, timeout=None
         )
         self._verifyResourceProperties(job, RESOURCE)
 
@@ -2714,7 +2723,7 @@ def test_cancel_w_alternate_client(self):
 
         conn1.api_request.assert_not_called()
         conn2.api_request.assert_called_once_with(
-            method="POST", path=PATH, query_params={}, timeout=None,
+            method="POST", path=PATH, query_params={}, timeout=None
         )
         self._verifyResourceProperties(job, RESOURCE)
 
@@ -3140,7 +3149,7 @@ def test_exists_miss_w_bound_client(self):
         final_attributes.assert_called_with({"path": PATH}, client, job)
 
         conn.api_request.assert_called_once_with(
-            method="GET", path=PATH, query_params={"fields": "id"}, timeout=None,
+            method="GET", path=PATH, query_params={"fields": "id"}, timeout=None
         )
 
     def test_exists_hit_w_alternate_client(self):
@@ -3555,7 +3564,7 @@ def test_exists_miss_w_bound_client(self):
         final_attributes.assert_called_with({"path": PATH}, client, job)
 
         conn.api_request.assert_called_once_with(
-            method="GET", path=PATH, query_params={"fields": "id"}, timeout=None,
+            method="GET", path=PATH, query_params={"fields": "id"}, timeout=None
         )
 
     def test_exists_hit_w_alternate_client(self):