[ARVADOS] updated: e09bff41f4beb428545f043cedb20bb5e44924d6

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/__init__.py |  3 +++
 sdk/python/tests/test_init.py  | 20 ++++++++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

       via  e09bff41f4beb428545f043cedb20bb5e44924d6 (commit)
      from  a8ed46722860019c0d69f89497a33a7d22d36074 (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 e09bff41f4beb428545f043cedb20bb5e44924d6
Author: Bryan Cosca <bcosc at curoverse.com>
Date:   Thu Aug 20 14:41:49 2015 -0400

    still flailing

diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index 953c073..dbc6e01 100644
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -142,6 +142,9 @@ class job_setup:
         if not api_client:
             api_client = api('v1')
 
+        if not num_retries:
+            num_retries = 2
+
         job_input = current_job()['script_parameters']['input']
         cr = CollectionReader(job_input, api_client=api_client)
         cr.normalize()
diff --git a/sdk/python/tests/test_init.py b/sdk/python/tests/test_init.py
index 40de3a9..63c96a9 100644
--- a/sdk/python/tests/test_init.py
+++ b/sdk/python/tests/test_init.py
@@ -12,12 +12,20 @@ from arvados_testutil import FakeCurl
 from arvados_testutil import queue_with
 from arvados_testutil import mock_responses
 
-class JobSetupTestCase(unittest.TestCase):
-
-    def test_task_output_success(self):
-        mock_api=mock.MagicMock()
-        with mock_responses({}, 500,200,300, header=None):
-            arvados.job_setup.one_task_per_input_file(api_client=mock_api,num_retries=0)        
+class SDKTestCase(unittest.TestCase, tutil.ApiClientMock):
+
+    def check_errors_from_last_retry(self, verb, exc_class):
+        api_client = self.mock_keep_services(count=2)
+        req_mock = tutil.mock_keep_responses(
+            "retry error reporting test")
+        with req_mock, tutil.skip_sleep, \
+                self.assertRaises(exc_class) as err_check:
+            keep_client = arvados.KeepClient(api_client=api_client)
+            getattr(keep_client, verb)('d41d8cd98f00b204e9800998ecf8427e+0',
+                                       num_retries=3)
+        self.assertEqual([403, 403], [
+                getattr(error, 'status_code', None)
+                for error in err_check.exception.request_errors().itervalues()])
 
 #### tests for functions, not methods ####
 

-----------------------------------------------------------------------


hooks/post-receive
--