retain as much of the dockerPull/imageId as possible

Author: mr-c

cwltool/singularity.py

@@ -54,16 +54,10 @@ def _singularity_supports_userns():  # type: ()->bool
     return _USERNS
 
 def _normalize_image_id(string):  # type: (Text)->Text
-    candidate = re.sub(pattern=r'([a-z]*://)', repl=r'', string=string)
-    return re.sub(pattern=r'[:/]', repl=r'-', string=candidate) + ".img"
+    return string.replace('/', '_') + '.img'
 
 def _normalize_sif_id(string): # type: (Text)->Text
-    candidate = re.sub(pattern=r'([a-z]*://)', repl=r'', string=string)
-    candidate_new = re.sub(pattern=r'[::]', repl=r'_', string=candidate) + ".sif"
-    if '/' in candidate_new:
-        return candidate_new.split('/')[1]
-    else:
-        return candidate_new
+    return string.replace('/', '_') + '.sif'
 
 class SingularityCommandLineJob(ContainerCommandLineJob):
 

tests/test_udocker.py

@@ -51,7 +51,7 @@ def test_udocker_usage_should_not_write_cid_file(self, tmpdir):
 
         tmpdir.remove(ignore_errors=True)
 
-        assert "completed success" in stderr
+        assert "completed success" in stderr, stderr
         assert cidfiles_count == 0
 
     @pytest.mark.skipif(TRAVIS, reason='Not reliable on single threaded test on travis.')
@@ -63,5 +63,5 @@ def test_udocker_should_display_memory_usage(self, tmpdir):
         cwd.chdir()
         tmpdir.remove(ignore_errors=True)
 
-        assert "completed success" in stderr
-        assert "Max memory" in stderr
+        assert "completed success" in stderr, stderr
+        assert "Max memory" in stderr, stderr