Merge pull request #3005 from tseaver/3003-bigquery-job_status_via_property

tseaver · web-flow · commit ac612e66f1ed · 2017-02-13T15:54:40.000-05:00
Check running status via 'job' property.

Merging without waiting for the speech fix to land.
diff --git a/bigquery/google/cloud/bigquery/query.py b/bigquery/google/cloud/bigquery/query.py
@@ -355,7 +355,7 @@ def run(self, client=None):
         :param client: the client to use.  If not passed, falls back to the
                        ``client`` stored on the current dataset.
         """
-        if self._job is not None:
+        if self.job is not None:
             raise ValueError("Query job is already running.")
 
         client = self._require_client(client)
diff --git a/bigquery/unit_tests/test_query.py b/bigquery/unit_tests/test_query.py
@@ -394,6 +394,15 @@ def test_run_w_already_has_job(self):
         with self.assertRaises(ValueError):
             query.run()
 
+    def test_run_w_already_has_job_in_properties(self):
+        JOB_ID = 'JOB_ID'
+        conn = _Connection()
+        client = _Client(project=self.PROJECT, connection=conn)
+        query = self._make_one(self.QUERY, client)
+        query._properties['jobReference'] = {'jobId': JOB_ID}
+        with self.assertRaises(ValueError):
+            query.run()
+
     def test_run_w_bound_client(self):
         PATH = 'projects/%s/queries' % self.PROJECT
         RESOURCE = self._makeResource(complete=False)
