10291: Fix catching all exceptions in test case.

[arvados.git] / sdk / cwl / tests / test_job.py

diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py
index 99e34d35074bed1030ec2abd5af49c68fe5cc487..db1c494c44cb91cf8ccebeb693123583d75594c1 100644 (file)
--- a/sdk/cwl/tests/test_job.py
+++ b/sdk/cwl/tests/test_job.py
@@ -22,7 +22,8 @@ class TestJob(unittest.TestCase):
         runner = mock.MagicMock()
         runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
         runner.ignore_docker_for_reuse = False
-        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3")
+        runner.num_retries = 0
+        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0")
 
         tool = {
             "inputs": [],
@@ -70,7 +71,11 @@ class TestJob(unittest.TestCase):
         runner = mock.MagicMock()
         runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
         runner.ignore_docker_for_reuse = False
-        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("draft-3")
+        runner.num_retries = 0
+        arvados_cwl.add_arv_hints()
+
+        document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0")
+
 
         tool = {
             "inputs": [],
@@ -124,8 +129,8 @@ class TestJob(unittest.TestCase):
                      ['script_version', 'in git', '9e5b98e8f5f4727856b53447191f9c06e3da2ba6'],
                      ['docker_image_locator', 'in docker', 'arvados/jobs']])
 
-    @mock.patch("arvados.collection.Collection")
-    def test_done(self, col):
+    @mock.patch("arvados.collection.CollectionReader")
+    def test_done(self, reader):
         api = mock.MagicMock()
 
         runner = mock.MagicMock()
@@ -134,7 +139,7 @@ class TestJob(unittest.TestCase):
         runner.num_retries = 0
         runner.ignore_docker_for_reuse = False
 
-        col().open.return_value = []
+        reader().open.return_value = []
         api.collections().list().execute.side_effect = ({"items": []},
                                                         {"items": [{"manifest_text": "XYZ"}]})
 
@@ -168,8 +173,8 @@ class TestJob(unittest.TestCase):
                   'owner_uuid': 'zzzzz-8i9sb-zzzzzzzzzzzzzzz',
                   'name': 'Output 9999999 of testjob'})
 
-    @mock.patch("arvados.collection.Collection")
-    def test_done_use_existing_collection(self, col):
+    @mock.patch("arvados.collection.CollectionReader")
+    def test_done_use_existing_collection(self, reader):
         api = mock.MagicMock()
 
         runner = mock.MagicMock()
@@ -177,7 +182,7 @@ class TestJob(unittest.TestCase):
         runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
         runner.num_retries = 0
 
-        col().open.return_value = []
+        reader().open.return_value = []
         api.collections().list().execute.side_effect = ({"items": [{"uuid": "zzzzz-4zz18-zzzzzzzzzzzzzz2"}]},)
 
         arvjob = arvados_cwl.ArvadosJob(runner)
@@ -211,8 +216,10 @@ class TestWorkflow(unittest.TestCase):
         arvados_cwl.add_arv_hints()
 
         runner = arvados_cwl.ArvCwlRunner(mock.MagicMock())
+
         runner.project_uuid = "zzzzz-8i9sb-zzzzzzzzzzzzzzz"
         runner.ignore_docker_for_reuse = False
+        runner.num_retries = 0
         document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.0")
 
         tool, metadata = document_loader.resolve_ref("tests/wf/scatter2.cwl")