From 5a13e23f74d2f4e3eb50f43fff2b276f27cb222c Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 11 Jun 2019 14:08:26 -0400 Subject: [PATCH] Test setUp sets cwltool global names set used to ensure unique names no issue # Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/tests/test_container.py | 6 ++++++ sdk/cwl/tests/test_job.py | 7 +++++++ sdk/cwl/tests/test_submit.py | 5 +++++ 3 files changed, 18 insertions(+) diff --git a/sdk/cwl/tests/test_container.py b/sdk/cwl/tests/test_container.py index b62229fbca..c22ece38b6 100644 --- a/sdk/cwl/tests/test_container.py +++ b/sdk/cwl/tests/test_container.py @@ -56,6 +56,9 @@ class CollectionMock(object): class TestContainer(unittest.TestCase): + def setUp(self): + cwltool.process._names = set() + def helper(self, runner, enable_reuse=True): document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.1") @@ -823,6 +826,9 @@ class TestContainer(unittest.TestCase): class TestWorkflow(unittest.TestCase): + def setUp(self): + cwltool.process._names = set() + def helper(self, runner, enable_reuse=True): document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.1") diff --git a/sdk/cwl/tests/test_job.py b/sdk/cwl/tests/test_job.py index d6d9b485ed..f08e14f7cd 100644 --- a/sdk/cwl/tests/test_job.py +++ b/sdk/cwl/tests/test_job.py @@ -35,6 +35,9 @@ if not os.getenv('ARVADOS_DEBUG'): class TestJob(unittest.TestCase): + def setUp(self): + cwltool.process._names = set() + def helper(self, runner, enable_reuse=True): document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.1") @@ -345,6 +348,10 @@ class TestJob(unittest.TestCase): class TestWorkflow(unittest.TestCase): + + def setUp(self): + cwltool.process._names = set() + def helper(self, runner, enable_reuse=True): document_loader, avsc_names, schema_metadata, metaschema_loader = cwltool.process.get_schema("v1.1") diff --git a/sdk/cwl/tests/test_submit.py b/sdk/cwl/tests/test_submit.py index d2c4d9c2ea..1dbd968eaa 100644 --- a/sdk/cwl/tests/test_submit.py +++ b/sdk/cwl/tests/test_submit.py @@ -17,6 +17,7 @@ import logging import mock import sys import unittest +import cwltool.process from io import BytesIO @@ -335,6 +336,10 @@ def stubs(func): class TestSubmit(unittest.TestCase): + + def setUp(self): + cwltool.process._names = set() + @mock.patch("arvados_cwl.arvdocker.arv_docker_get_image") @mock.patch("time.sleep") @stubs -- 2.39.5