[virt-bootstrap] [PATCH 1/4] Revert "docker-source: Support blobs without .tar ext"

[Radostin Stoyanov <rstoyanov1@xxxxxxxxx>]

This reverts commit 6146e9ab5e36ff894b8c95d00a45db6181ad8472.
---
 src/virtBootstrap/sources/docker_source.py |  6 +-----
 tests/docker_source.py                     | 13 ++++---------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/virtBootstrap/sources/docker_source.py b/src/virtBootstrap/sources/docker_source.py
index 4281f55..715e560 100644
--- a/src/virtBootstrap/sources/docker_source.py
+++ b/src/virtBootstrap/sources/docker_source.py
@@ -107,11 +107,7 @@ class DockerSource(object):
             self.checksums.append([sum_type, layer_sum])  # Store checksums
 
             # Layers are tar files with hashsum used as name
-            file_path = os.path.join(self.images_dir, layer_sum)
-            if not os.path.isfile(file_path):
-                file_path += '.tar'
-                if not os.path.isfile(file_path):
-                    raise ValueError('Blob %s does not exist.' % file_path)
+            file_path = os.path.join(self.images_dir, layer_sum + '.tar')
             # Store 'file path' and set placeholder for 'size'
             self.layers.append([file_path, None])
 
diff --git a/tests/docker_source.py b/tests/docker_source.py
index 204f945..ba6f930 100644
--- a/tests/docker_source.py
+++ b/tests/docker_source.py
@@ -335,12 +335,9 @@ class TestDockerSource(unittest.TestCase):
         }
 
         manifest = {'schemaVersion': 2, 'Layers': ['sha256:a7050fc1']}
-
-        with mock.patch('os.path.isfile') as m_isfile:
-            m_isfile.return_value = True
-            result = self._mock_retrieve_layers_info(manifest, src_kwargs)
-
-        src_instance, m_uri, m_utils = result
+        (src_instance,
+         m_uri, m_utils) = self._mock_retrieve_layers_info(manifest,
+                                                           src_kwargs)
 
         kwargs = {
             'insecure': src_instance.insecure,
@@ -376,9 +373,7 @@ class TestDockerSource(unittest.TestCase):
             ['/images_path/75c416ea.tar', None]
         ]
 
-        with mock.patch('os.path.getsize') as m_getsize, \
-                mock.patch('os.path.isfile') as m_isfile:
+        with mock.patch('os.path.getsize') as m_getsize:
             m_getsize.return_value = None
-            m_isfile.side_effect = lambda x: x.endswith(".tar")
             src_instance = self._mock_retrieve_layers_info(manifest, kwargs)[0]
         self.assertEqual(src_instance.layers, expected_result)
-- 
2.14.3

_______________________________________________
virt-tools-list mailing list
virt-tools-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/virt-tools-list