[ARVADOS] updated: 1.3.0-159-g7360ecf9c

[Git user]

Summary of changes:
 sdk/cwl/arvados_cwl/executor.py | 5 +++++
 sdk/cwl/tests/test_submit.py    | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

       via  7360ecf9c5bd593834c45b1ad60bf0b6ac30d05e (commit)
       via  dd517b036d14a4e5d78c1fbde97f1760bf848004 (commit)
      from  5e66fb80a5053b1c51b58191f042dbc40839ba9d (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 7360ecf9c5bd593834c45b1ad60bf0b6ac30d05e
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 10:04:03 2019 -0500

    13306: Removes a log handler added during a test, breaking subsequent tests.
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py
index 7f1688c75..a1ace717b 100644
--- a/sdk/cwl/tests/test_submit.py
+++ b/sdk/cwl/tests/test_submit.py
@@ -1609,8 +1609,9 @@ class TestCreateWorkflow(unittest.TestCase):
     @stubs
     def test_incompatible_api(self, stubs):
         capture_stderr = io.StringIO()
-        logging.getLogger('arvados.cwl-runner').addHandler(
-            logging.StreamHandler(capture_stderr))
+        acr_logger = logging.getLogger('arvados.cwl-runner')
+        stderr_logger = logging.StreamHandler(capture_stderr)
+        acr_logger.addHandler(stderr_logger)
 
         exited = arvados_cwl.main(
             ["--update-workflow", self.existing_workflow_uuid,
@@ -1622,6 +1623,7 @@ class TestCreateWorkflow(unittest.TestCase):
         self.assertRegexpMatches(
             capture_stderr.getvalue(),
             "--update-workflow arg '{}' uses 'containers' API, but --api='jobs' specified".format(self.existing_workflow_uuid))
+        acr_logger.removeHandler(stderr_logger)
 
     @stubs
     def test_update(self, stubs):

commit dd517b036d14a4e5d78c1fbde97f1760bf848004
Author: Eric Biagiotti <ebiagiotti at veritasgenetcs.com>
Date:   Thu Jan 17 10:02:43 2019 -0500

    13306: Prevents multiple RunTimeStatusLoggingHandlers from being added
    
    Arvados-DCO-1.1-Signed-off-by:  Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/arvados_cwl/executor.py b/sdk/cwl/arvados_cwl/executor.py
index 60ea2ce82..e5a3d5985 100644
--- a/sdk/cwl/arvados_cwl/executor.py
+++ b/sdk/cwl/arvados_cwl/executor.py
@@ -185,6 +185,11 @@ http://doc.arvados.org/install/install-api-server.html#disable_api_methods
         # if running inside a container
         if arvados_cwl.util.get_current_container(self.api, self.num_retries, logger):
             root_logger = logging.getLogger('')
+
+            # Remove existing RuntimeStatusLoggingHandlers if they exist
+            handlers = [h for h in root_logger.handlers if not isinstance(h, RuntimeStatusLoggingHandler)]
+            root_logger.handlers = handlers
+
             handler = RuntimeStatusLoggingHandler(self.runtime_status_update)
             root_logger.addHandler(handler)
 

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


hooks/post-receive
--