Merge pull request #4 from UW-GAC/feature/better-reporting

Add more debugging output when checking expected files

fetch.py

@@ -100,12 +100,17 @@ def _check_prefetch_against_manifest(self, directory, manifest):
         """Check that prefetch downloaded all the files in the manifest."""
         expected_files = self._read_manifest(manifest)
         downloaded_files = os.listdir(directory)
+        print("Found downloaded files:")
+        print(sorted(downloaded_files))
+        print("Expected {} files; found {} files.", len(expected_files), len(downloaded_files))
         return set(downloaded_files) == set(expected_files)
 
     def _check_prefetch_against_n_files(self, directory, n_files):
         """Check that prefetch downloaded the expected number of files."""
         downloaded_files = os.listdir(directory)
-        print(downloaded_files)
+        print("Found downloaded files:")
+        print(sorted(downloaded_files))
+        print("Expected {} files; found {} files.", n_files, len(downloaded_files))
         return len(downloaded_files) == n_files
 
     def _untar(self, directory):

fetch_dbgap_files.wdl

@@ -50,7 +50,7 @@ task fetch_files {
     }
     runtime {
         # Pull from DockerHub
-        docker: "uwgac/fetch-dbgap-files:0.2.0"
+        docker: "uwgac/fetch-dbgap-files:0.2.1"
         disks: "local-disk ${disk_gb} SSD"
     }
 }