projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
10129: Ensure that directory literals get preserved when trimming keep directory...
[arvados.git]
/
sdk
/
cwl
/
tests
/
test_submit.py
diff --git
a/sdk/cwl/tests/test_submit.py
b/sdk/cwl/tests/test_submit.py
index f57ff320b2a9492e875a79c10c9e651919e2c1f1..eb7199295144368d30da1122e435209e2c6323fa 100644
(file)
--- a/
sdk/cwl/tests/test_submit.py
+++ b/
sdk/cwl/tests/test_submit.py
@@
-93,6
+93,15
@@
def stubs(func):
'location': 'keep:99999999999999999999999999999998+99',
'class': 'Directory'
},
'location': 'keep:99999999999999999999999999999998+99',
'class': 'Directory'
},
+ 'z': {
+ 'basename': 'anonymous',
+ "listing": [{
+ "basename": "renamed.txt",
+ "class": "File",
+ "location": "keep:99999999999999999999999999999998+99/file1.txt"
+ }],
+ 'class': 'Directory'
+ },
'cwl:tool':
'99999999999999999999999999999991+99/wf/submit_wf.cwl'
},
'cwl:tool':
'99999999999999999999999999999991+99/wf/submit_wf.cwl'
},
@@
-117,7
+126,7
@@
def stubs(func):
'kind': 'file'
},
'/var/lib/cwl/job/cwl.input.json': {
'kind': 'file'
},
'/var/lib/cwl/job/cwl.input.json': {
- 'portable_data_hash': '
606be75b6e4f811a2f282d7fac867043
+60/cwl.input.json',
+ 'portable_data_hash': '
d20d7cddd1984f105dd3702c7f125afb
+60/cwl.input.json',
'kind': 'collection'
}
},
'kind': 'collection'
}
},
@@
-160,7
+169,7
@@
class TestSubmit(unittest.TestCase):
'manifest_text':
'./tool d51232d96b6116d964a69bfb7e0c73bf+450 '
'0:16:blub.txt 16:434:submit_tool.cwl\n./wf '
'manifest_text':
'./tool d51232d96b6116d964a69bfb7e0c73bf+450 '
'0:16:blub.txt 16:434:submit_tool.cwl\n./wf '
- '
0f8864f292e901019c43fdabacd62c3e+383 0:38
3:submit_wf.cwl\n',
+ '
cc2ffb940e60adf1b2b282c67587e43d+413 0:41
3:submit_wf.cwl\n',
'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz',
'name': 'submit_wf.cwl',
}, ensure_unique_name=True),
'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz',
'name': 'submit_wf.cwl',
}, ensure_unique_name=True),
@@
-220,7
+229,7
@@
class TestSubmit(unittest.TestCase):
'manifest_text':
'./tool d51232d96b6116d964a69bfb7e0c73bf+450 '
'0:16:blub.txt 16:434:submit_tool.cwl\n./wf '
'manifest_text':
'./tool d51232d96b6116d964a69bfb7e0c73bf+450 '
'0:16:blub.txt 16:434:submit_tool.cwl\n./wf '
- '
0f8864f292e901019c43fdabacd62c3e+383 0:38
3:submit_wf.cwl\n',
+ '
cc2ffb940e60adf1b2b282c67587e43d+413 0:41
3:submit_wf.cwl\n',
'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz',
'name': 'submit_wf.cwl',
}, ensure_unique_name=True),
'owner_uuid': 'zzzzz-tpzed-zzzzzzzzzzzzzzz',
'name': 'submit_wf.cwl',
}, ensure_unique_name=True),
@@
-278,6
+287,11
@@
class TestCreateTemplate(unittest.TestCase):
'type': 'Directory',
'value': '99999999999999999999999999999998+99',
}
'type': 'Directory',
'value': '99999999999999999999999999999998+99',
}
+ expect_component['script_parameters']['z'] = {
+ 'dataclass': 'Collection',
+ 'required': True,
+ 'type': 'Directory',
+ }
expect_template = {
"components": {
"submit_wf.cwl": expect_component,
expect_template = {
"components": {
"submit_wf.cwl": expect_component,