[ARVADOS] updated: 1.3.0-414-g0818f8a83

Git user git at public.curoverse.com
Mon Mar 4 14:45:27 EST 2019


Summary of changes:
 sdk/cwl/tests/test_container.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

       via  0818f8a837bd9d60132f0c7bc8cd06f15e0002d2 (commit)
      from  703b21198473ca619b1c83726bc654563384d96f (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 0818f8a837bd9d60132f0c7bc8cd06f15e0002d2
Author: Eric Biagiotti <ebiagiotti at veritasgenetics.com>
Date:   Mon Mar 4 14:44:39 2019 -0500

    14886: Updates test to fail for the more specific case
    
    Arvados-DCO-1.1-Signed-off-by: Eric Biagiotti <ebiagiotti at veritasgenetics.com>

diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py
index 6ca5827a0..4d6bcd2f6 100644
--- a/sdk/cwl/tests/test_container.py
+++ b/sdk/cwl/tests/test_container.py
@@ -500,7 +500,6 @@ class TestContainer(unittest.TestCase):
         arvjob.output_callback.assert_called_with({"out": "stuff"}, "success")
         runner.add_intermediate_output.assert_called_with("zzzzz-4zz18-zzzzzzzzzzzzzz2")
 
-    # Test for issue 14886
     # Test to make sure we dont call runtime_status_update if we already did
     # some where higher up in the call stack
     @mock.patch("arvados_cwl.util.get_current_container")
@@ -520,7 +519,10 @@ class TestContainer(unittest.TestCase):
         # get_current_container is invoked when we call runtime_status_update
         # so try and log again!
         gcc_mock.side_effect = lambda *args: root_logger.error("Second Error")
-        root_logger.error("First Error")
+        try: 
+            root_logger.error("First Error")
+        except RuntimeError as e: 
+            self.fail(str(e))
 
     @mock.patch("arvados_cwl.util.get_current_container")
     @mock.patch("arvados.collection.CollectionReader")

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


hooks/post-receive
-- 




More information about the arvados-commits mailing list