summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRadostin Stoyanov <rstoyanov1@gmail.com>2018-04-24 08:42:10 +0100
committerRadostin Stoyanov <rstoyanov1@gmail.com>2018-04-24 08:42:10 +0100
commit663ecd5eb1d3610793f93a72f36a07f0b8adecb0 (patch)
tree8809eb424da59852102d79e142eda192d9706c44 /tests
parent20c0c7607ee11ef24e7453df2311d83e98af83a3 (diff)
downloadvirt-bootstrap.git-663ecd5eb1d3610793f93a72f36a07f0b8adecb0.tar.gz
virt-bootstrap.git-663ecd5eb1d3610793f93a72f36a07f0b8adecb0.tar.xz
virt-bootstrap.git-663ecd5eb1d3610793f93a72f36a07f0b8adecb0.zip
Revert "docker-source: Support blobs without .tar ext"
This reverts commit 6146e9ab5e36ff894b8c95d00a45db6181ad8472.
Diffstat (limited to 'tests')
-rw-r--r--tests/docker_source.py13
1 files changed, 4 insertions, 9 deletions
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)