|
@@ -58,10 +58,17 @@ class TestNotebook(object):
|
|
|
query.check_status = Mock(
|
|
query.check_status = Mock(
|
|
|
side_effect=check_status_side_effect
|
|
side_effect=check_status_side_effect
|
|
|
)
|
|
)
|
|
|
|
|
+ query.fetch_result_data = Mock(
|
|
|
|
|
+ return_value={'results': [[1], [2]]}
|
|
|
|
|
+ )
|
|
|
request = Mock()
|
|
request = Mock()
|
|
|
|
|
|
|
|
- resp = query.execute_and_wait(request=request)
|
|
|
|
|
- assert_equal(1, resp['history_uuid'])
|
|
|
|
|
|
|
+ resp = query.execute_and_wait(request=request, include_results=True)
|
|
|
|
|
+
|
|
|
|
|
+ assert_equal(0, resp.get('status'), resp)
|
|
|
|
|
+ assert_equal('available', resp['query_status']['status'], resp)
|
|
|
|
|
+ assert_equal([[1], [2]], resp.get('results'), resp)
|
|
|
|
|
+
|
|
|
assert_equal(2, query.check_status.call_count)
|
|
assert_equal(2, query.check_status.call_count)
|
|
|
|
|
|
|
|
|
|
|
|
@@ -90,6 +97,6 @@ def check_status_side_effect(request, operation_id):
|
|
|
|
|
|
|
|
if iteration == 0:
|
|
if iteration == 0:
|
|
|
iteration += 1
|
|
iteration += 1
|
|
|
- return {'status': 'running'}
|
|
|
|
|
|
|
+ return {'status': 0, 'query_status': {'status': 'running'}}
|
|
|
else:
|
|
else:
|
|
|
- return {'status': 'done'}
|
|
|
|
|
|
|
+ return {'status': 0, 'query_status': {'status': 'available'}}
|