Propagate "listing" in scandeps (#197)

* Propagate "listing" in scandeps * Add test for directory listing in scandeps.
common-workflow-language · Sep 22, 2016 · cf241cd · cf241cd
1 parent 00fce36
commit cf241cd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/cwltool/process.py b/cwltool/process.py
@@ -652,6 +652,8 @@ def scandeps(base, doc, reffields, urlfields, loadref):
                     "class": doc["class"],
                     "location": urlparse.urljoin(base, u)
                 }
+                if doc["class"] == "Directory" and "listing" in doc:
+                    deps["listing"] = doc["listing"]
                 deps = nestdir(base, deps)
                 r.append(deps)
 

diff --git a/tests/test_examples.py b/tests/test_examples.py
@@ -131,7 +131,11 @@ def test_scandeps(self):
                             "id": "file:///example/bar.cwl#input2",
                             "default": {
                                 "class": "Directory",
-                                "location": "file:///example/data2"
+                                "location": "file:///example/data2",
+                                "listing": [{
+                                    "class": "File",
+                                    "location": "file:///example/data3.txt"
+                                }]
                             }
                         }]
                     }
@@ -165,7 +169,17 @@ def loadref(base, p):
         {
             "basename": "data2",
             "class": "Directory",
-            "location": "file:///example/data2"
+            "location": "file:///example/data2",
+            "listing": [{
+                "basename": "data3.txt",
+                "class": "File",
+                "location": "file:///example/data3.txt"
+            }]
+        },
+        {
+            "basename": "data3.txt",
+            "class": "File",
+            "location": "file:///example/data3.txt"
         }], sc)
 
         sc = cwltool.process.scandeps(obj["id"], obj,