From 1dd56e127c9460713f10996a5ff8d4ddf6244b29 Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Mon, 25 Apr 2022 17:00:53 -0400 Subject: [PATCH] 18835: Add a test for the is_in_collection feature of PathMapper Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- .licenseignore | 1 + .../fake_collection_dir/.arvados#collection | 3 +++ .../fake_collection_dir/subdir/banana.txt | 5 +++++ sdk/cwl/tests/test_pathmapper.py | 13 +++++++++++++ 4 files changed, 22 insertions(+) create mode 100644 sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection create mode 100644 sdk/cwl/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt diff --git a/.licenseignore b/.licenseignore index d13eee3901..387aeda944 100644 --- a/.licenseignore +++ b/.licenseignore @@ -51,6 +51,7 @@ docker/jobs/1078ECD7.key sdk/cwl/tests/input/blorp.txt sdk/cwl/tests/tool/blub.txt sdk/cwl/tests/federation/data/* +sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection sdk/go/manifest/testdata/*_manifest sdk/java/.classpath sdk/java/pom.xml diff --git a/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection b/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection new file mode 100644 index 0000000000..fb13a7e37f --- /dev/null +++ b/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/.arvados#collection @@ -0,0 +1,3 @@ +{ + "portable_data_hash": "99999999999999999999999999999991+99" +} \ No newline at end of file diff --git a/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt b/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt new file mode 100644 index 0000000000..05631af7be --- /dev/null +++ b/sdk/cwl/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt @@ -0,0 +1,5 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: Apache-2.0 + +strawberry diff --git a/sdk/cwl/tests/test_pathmapper.py b/sdk/cwl/tests/test_pathmapper.py index cbd5ba1bc1..194092db7a 100644 --- a/sdk/cwl/tests/test_pathmapper.py +++ b/sdk/cwl/tests/test_pathmapper.py @@ -238,3 +238,16 @@ class TestPathmap(unittest.TestCase): p._pathmap["keep:99999999999999999999999999999991+99/hw.py"] = True p._pathmap["_:123"] = True self.assertTrue(p.needs_new_collection(a)) + + def test_is_in_collection(self): + arvrunner = arvados_cwl.executor.ArvCwlExecutor(self.api) + self.maxDiff = 1000000 + + cwd = os.getcwd() + p = ArvPathMapper(arvrunner, [{ + "class": "File", + "location": "file://"+cwd+"/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt" + }], "", "/test/%s", "/test/%s/%s") + + self.assertEqual({"file://"+cwd+"/tests/fake-keep-mount/fake_collection_dir/subdir/banana.txt": MapperEnt(resolved='keep:99999999999999999999999999999991+99/subdir/banana.txt', target='/test/99999999999999999999999999999991+99/subdir/banana.txt', type='File', staged=True)}, + p._pathmap) -- 2.30.2