[ARVADOS] updated: 58f25f3a8ff57c5db8124b553a81eefa62482a81
git at public.curoverse.com
git at public.curoverse.com
Thu Aug 27 14:57:14 EDT 2015
Summary of changes:
sdk/python/tests/test_init.py | 83 ++++++++++++++++++++-----------------------
1 file changed, 39 insertions(+), 44 deletions(-)
via 58f25f3a8ff57c5db8124b553a81eefa62482a81 (commit)
from af03a10a8adc27a91f1483c2ee976b2023b14aa6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 58f25f3a8ff57c5db8124b553a81eefa62482a81
Author: Bryan Cosca <bcosc at curoverse.com>
Date: Thu Aug 27 14:57:07 2015 -0400
some tests not working??
diff --git a/sdk/python/tests/test_init.py b/sdk/python/tests/test_init.py
index 6b5da77..93b4d15 100644
--- a/sdk/python/tests/test_init.py
+++ b/sdk/python/tests/test_init.py
@@ -4,6 +4,7 @@ import mock
import os
import unittest
import hashlib
+import Queue
import arvados
import arvados.collection
@@ -13,8 +14,14 @@ from arvados_testutil import FakeCurl
from arvados_testutil import queue_with
from arvados_testutil import mock_responses
+def mock_responses(*codes, **headers):
+ body = ''
+ mock_api = mock.MagicMock()
+ mock_api.job_tasks().get().update().execute.side_effect=tutil.queue_with((tutil.fake_httplib2_response(code, **headers), body) for code in codes)
+ return mock_api
+
@tutil.skip_sleep
-class TaskSetOutputTestCase():#unittest.TestCase, tutil.ApiClientMock):
+class TaskSetOutputTestCase(unittest.TestCase, tutil.ApiClientMock):
def mock_call_update(self, api_mock, code, body):
self._mock_api_call(api_mock, code, body)
@@ -23,11 +30,7 @@ class TaskSetOutputTestCase():#unittest.TestCase, tutil.ApiClientMock):
self.mock_call_update(api_client.job_tasks().update, status, 'foo_file')
return api_client
- #def create_side_effect(self, mock_api, *codes):
- #mock_api.job_tasks().update().execute.side_effect = []
- #for code in codes:
- #mock_api.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(codes), "{}")]
- #return mock_api
+ api_client = mock.MagicMock()
def test_mock_retry_until_break(self,code=500):
api_client = self.api_client_mock(code)
@@ -43,57 +46,55 @@ class TaskSetOutputTestCase():#unittest.TestCase, tutil.ApiClientMock):
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=1)
- def test_mock_retry_success(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_success(self,api_client=api_client):
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200)]
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=1)
- def test_mock_retry_fail(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_fail(self,api_client=api_client):
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(404), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=1)
- def test_mock_retry_retry(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_retry(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=1)
- def test_mock_retry_success_retry(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_success_retry(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=2)
- def test_mock_retry_fail_retry(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_fail_retry(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(400), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=2)
- def test_mock_success_retry_retry(self):
- api_client = mock.MagicMock()
+ def test_mock_success_retry_retry(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [tutil.fake_httplib2_response(200),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=2)
- def test_mock_retry_retry_success(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_retry_success(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200)]
arvados.task_set_output({'uuid':'zzzzz-zzzzz-zzzzzzzzzzzzzzz'},s='d41d8cd98f00b204e9800998ecf8427e+0',api_client=api_client,num_retries=2)
- def test_mock_retry_retry_fail(self):
- api_client = mock.MagicMock()
+ def test_mock_retry_retry_fail(self,api_client=api_client):
+# api_client = mock.MagicMock()
api_client.job_tasks().update().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(400), "{}")]
@@ -107,66 +108,60 @@ class CurrentTaskTestCase(unittest.TestCase, tutil.ApiClientMock):
os.environ['TASK_UUID'] = 'zzzzz-zzzzz-zzzzzzzzzzzzzzz'
os.environ['TASK_WORK'] = '.'
-# def mock_call_update(self, api_mock, code, body):
-# self._mock_api_call(api_mock, code, body)
-
-# def api_client_mock(self, status=200):
-# api_client = super(CurrentTaskTestCase, self).api_client_mock()
-# self.mock_call_update(api_client.job_tasks().get, status, 'foo_file')
-# return api_client
-
- def test_mock_lol_retry_until_break(self):
+ def test_mock_retry_until_break(self):
api_client = mock.MagicMock()
- #api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
- with tutil.mock_keep_responses('', 400), self.assertRaises(arvados.errors.ApiError) as err_check:
+ api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
+ with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=0)
- def test_mock_lol_success(self):
+ def test_mock_success(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(200), "{}")]
arvados.current_task(api_client=api_client,num_retries=0)
- def test_mock_lol_fail(self):
+ def test_mock_fail(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(400), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=0)
- def test_mock_lol_success(self):
+ def test_mock_success(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(400), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=0)
- def test_mock_retry_lol_success(self):
+ def test_mock_retry_success(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200)]
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_lol_fail(self):
+ def test_mock_retry_fail(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(404), "{}")]
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_lol_retry(self):
+ def test_mock_retry_retry(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
+# api_client = mock_responses(500,500,500)
+# print api_client.job_tasks().get().execute.side_effect
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_success_lol_retry(self):
+ def test_mock_retry_success_retry(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_fail_lol_retry(self):
+ def test_mock_retry_fail_retry(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(400), "{}"),
@@ -174,21 +169,21 @@ class CurrentTaskTestCase(unittest.TestCase, tutil.ApiClientMock):
with self.assertRaises(arvados.errors.ApiError) as err_check:
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_success_retry_lol_retry(self):
+ def test_mock_success_retry_retry(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [tutil.fake_httplib2_response(200),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}")]
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_retry_lol_success(self):
+ def test_mock_retry_retry_success(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
tutil.fake_httplib2_response(200)]
arvados.current_task(api_client=api_client,num_retries=2)
- def test_mock_retry_retry_lol_fail(self):
+ def test_mock_retry_retry_fail(self):
api_client = mock.MagicMock()
api_client.job_tasks().get().execute.side_effect = [arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
arvados.errors.ApiError(tutil.fake_httplib2_response(500), "{}"),
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list