Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Model/parse 'job.cancel' API response correctly. #2379

Merged
merged 3 commits into from
Sep 22, 2016
Merged

Model/parse 'job.cancel' API response correctly. #2379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5443e14
Model/parse 'job.cancel' API response correctly.
tseaver Sep 21, 2016
b3f130a
Add a system test for '_AsyncJob.cancel'.
tseaver Sep 21, 2016
14b8cc4
Replace redundant 'job done' assertion with a note.
tseaver Sep 21, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion google/cloud/bigquery/job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,7 @@ def cancel(self, client=None):

api_response = client.connection.api_request(
method='POST', path='%s/cancel' % (self.path,))
self._set_properties(api_response)
self._set_properties(api_response['job'])


class _LoadConfiguration(object):
Expand Down
34 changes: 34 additions & 0 deletions system_tests/bigquery.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,3 +435,37 @@ def _job_done(instance):
by_age = operator.itemgetter(1)
self.assertEqual(sorted(rows, key=by_age),
sorted(ROWS, key=by_age))

def test_job_cancel(self):
DATASET_NAME = _make_dataset_name('job_cancel')
JOB_NAME = 'fetch_' + DATASET_NAME
TABLE_NAME = 'test_table'
QUERY = 'SELECT * FROM %s.%s' % (DATASET_NAME, TABLE_NAME)

dataset = Config.CLIENT.dataset(DATASET_NAME)

retry_403(dataset.create)()
self.to_delete.append(dataset)

full_name = bigquery.SchemaField('full_name', 'STRING',
mode='REQUIRED')
age = bigquery.SchemaField('age', 'INTEGER', mode='REQUIRED')
table = dataset.table(TABLE_NAME, schema=[full_name, age])
table.create()
self.to_delete.insert(0, table)

job = Config.CLIENT.run_async_query(JOB_NAME, QUERY)
job.begin()
job.cancel()

def _job_done(instance):
return instance.state in ('DONE', 'done')

retry = RetryInstanceState(_job_done, max_tries=8)
retry(job.reload)()

# The `cancel` API doesn't leave any reliable traces on
# the status of the job resource, so we can't really assert for
# them here. The best we can do is not that the API call didn't
# raise an error, and that the job completed (in the `retry()`
# above).
10 changes: 6 additions & 4 deletions unit_tests/bigquery/test_job.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,8 +601,9 @@ def test_reload_w_alternate_client(self):

def test_cancel_w_bound_client(self):
PATH = 'projects/%s/jobs/%s/cancel' % (self.PROJECT, self.JOB_NAME)
RESOURCE = self._makeResource()
conn = _Connection(RESOURCE)
RESOURCE = self._makeResource(ended=True)
RESPONSE = {'job': RESOURCE}
conn = _Connection(RESPONSE)
client = _Client(project=self.PROJECT, connection=conn)
table = _Table()
job = self._makeOne(self.JOB_NAME, table, [self.SOURCE1], client)
Expand All @@ -617,10 +618,11 @@ def test_cancel_w_bound_client(self):

def test_cancel_w_alternate_client(self):
PATH = 'projects/%s/jobs/%s/cancel' % (self.PROJECT, self.JOB_NAME)
RESOURCE = self._makeResource()
RESOURCE = self._makeResource(ended=True)
RESPONSE = {'job': RESOURCE}
conn1 = _Connection()
client1 = _Client(project=self.PROJECT, connection=conn1)
conn2 = _Connection(RESOURCE)
conn2 = _Connection(RESPONSE)
client2 = _Client(project=self.PROJECT, connection=conn2)
table = _Table()
job = self._makeOne(self.JOB_NAME, table, [self.SOURCE1], client1)
Expand Down