[ARVADOS] updated: 5e8544101a1a82f7c70b15cff94d83ff35e30063

[git at public.curoverse.com]

Summary of changes:
 sdk/python/arvados/__init__.py | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

       via  5e8544101a1a82f7c70b15cff94d83ff35e30063 (commit)
      from  84cc9874760687a061dc489f5a19db66cb06108e (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 5e8544101a1a82f7c70b15cff94d83ff35e30063
Author: Bryan Cosca <bcosc at curoverse.com>
Date:   Thu Aug 13 17:06:23 2015 -0400

    6600: Added support for mock_api in task_set_output and began task_set_output test in test_sdk.py

diff --git a/sdk/python/arvados/__init__.py b/sdk/python/arvados/__init__.py
index b7b2c15..8b5ffcb 100644
--- a/sdk/python/arvados/__init__.py
+++ b/sdk/python/arvados/__init__.py
@@ -40,11 +40,18 @@ logger.setLevel(logging.DEBUG if config.get('ARVADOS_DEBUG')
                 else logging.WARNING)
 
 @retry_method
-def task_set_output(self,s):
-    output_retry_loop = RetryLoop(num_retries=5, backoff_start=1)
+def task_set_output(self,s,num_retries=None,api_client=None):
+
+    if not api_client:
+        api_client = api('v1')
+
+    if not num_retries:
+        num_retries=5
+
+    output_retry_loop = RetryLoop(num_retries=num_retries, backoff_start=1)
     for tries_left in output_retry_loop:
 	try:
-	    api('v1').job_tasks().update(uuid=self['uuid'],
+	    api_client.job_tasks().update(uuid=self['uuid'],
         	                         body={
             					'output':s,
 				            	'success':True,
@@ -116,8 +123,8 @@ class job_setup:
     def __init__(self, num_retries=5):
         self.num_retries = num_retries
 
-    @retry_method
     @staticmethod
+    @retry_method
     def one_task_per_input_file(if_sequence=0, and_end_task=True, input_as_path=False, api_client=None, num_retries=None):
         if if_sequence != current_task()['sequence']:
             return
@@ -149,8 +156,8 @@ class job_setup:
                                        ).execute(num_retries)
             exit(0)
 
-    @retry_method
     @staticmethod
+    @retry_method
     def one_task_per_input_stream(if_sequence=0, and_end_task=True, num_retries=None):
         if if_sequence != current_task()['sequence']:
             return

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


hooks/post-receive
--