Remove redundant RetryInstanceState and add timeout to futures API .r…

…esult calls

bigquery/tests/system.py

@@ -35,6 +35,7 @@
 from test_utils.system import unique_resource_id
 
 
+JOB_TIMEOUT = 120  # 2 minutes
 WHERE = os.path.abspath(os.path.dirname(__file__))
 
 
@@ -381,9 +382,7 @@ def test_load_table_from_local_file_then_dump_table(self):
                 )
 
         # Retry until done.
-        job.result()
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
 
         self.assertEqual(job.output_rows, len(ROWS))
 
@@ -420,9 +419,7 @@ def test_load_table_from_local_avro_file_then_dump_table(self):
             )
 
         # Retry until done.
-        job.result()
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
 
         self.assertEqual(job.output_rows, len(ROWS))
 
@@ -772,9 +769,7 @@ def _load_table_for_dml(self, rows, dataset_name, table_name):
                 )
 
         # Retry until done.
-        job.result()
-        retry = RetryInstanceState(_job_done, max_tries=8)
-        retry(job.reload)()
+        job.result(timeout=JOB_TIMEOUT)
         self._fetch_single_page(table)
 
     def test_sync_query_w_dml(self):
@@ -1091,7 +1086,7 @@ def test_async_query_future(self):
             str(uuid.uuid4()), 'SELECT 1')
         query_job.use_legacy_sql = False
 
-        iterator = query_job.result().fetch_data()
+        iterator = query_job.result(timeout=JOB_TIMEOUT).fetch_data()
         rows = list(iterator)
         self.assertEqual(rows, [(1,)])