X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4dac499d30988fd8289a40ad4128d6d471037180..3712b5943d9d32346552cb91ec5c4690e14485b9:/sdk/cwl/tests/test_pathmapper.py diff --git a/sdk/cwl/tests/test_pathmapper.py b/sdk/cwl/tests/test_pathmapper.py index 86c48f2ddd..eaa5711422 100644 --- a/sdk/cwl/tests/test_pathmapper.py +++ b/sdk/cwl/tests/test_pathmapper.py @@ -1,3 +1,7 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + import functools import mock import sys @@ -16,7 +20,7 @@ from .mock_discovery import get_rootDesc from arvados_cwl.pathmapper import ArvPathMapper -def upload_mock(files, api, dry_run=False, num_retries=0, project=None, fnPattern="$(file %s/%s)", name=None, collection=None): +def upload_mock(files, api, dry_run=False, num_retries=0, project=None, fnPattern="$(file %s/%s)", name=None, collection=None, packed=None): pdh = "99999999999999999999999999999991+99" for c in files: c.keepref = "%s/%s" % (pdh, os.path.basename(c.fn)) @@ -62,23 +66,6 @@ class TestPathmap(unittest.TestCase): self.assertEqual({'file:tests/hw.py': MapperEnt(resolved='keep:99999999999999999999999999999991+99/hw.py', target='/test/99999999999999999999999999999991+99/hw.py', type='File', staged=True)}, p._pathmap) - @mock.patch("arvados.commands.run.uploadfiles") - def test_prev_uploaded(self, upl): - """Test pathmapper handling previously uploaded files.""" - - arvrunner = arvados_cwl.ArvCwlRunner(self.api) - arvrunner.add_uploaded('file:tests/hw.py', MapperEnt(resolved='keep:99999999999999999999999999999992+99/hw.py', target='', type='File', staged=True)) - - upl.side_effect = upload_mock - - p = ArvPathMapper(arvrunner, [{ - "class": "File", - "location": "file:tests/hw.py" - }], "", "/test/%s", "/test/%s/%s") - - self.assertEqual({'file:tests/hw.py': MapperEnt(resolved='keep:99999999999999999999999999999992+99/hw.py', target='/test/99999999999999999999999999999992+99/hw.py', type='File', staged=True)}, - p._pathmap) - @mock.patch("arvados.commands.run.uploadfiles") @mock.patch("arvados.commands.run.statfile") def test_statfile(self, statfile, upl):