summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRadostin Stoyanov <rstoyanov1@gmail.com>2018-04-24 09:03:34 +0100
committerRadostin Stoyanov <rstoyanov1@gmail.com>2018-04-28 23:14:55 +0100
commitf389756a192b6b6ad0951856d8681cc2077ccf6b (patch)
tree37d641bfa3772dafaf8d76b5f86ee345af59a91d /tests
parent0f2cbd130965f8f0e3b859779c9a6249ebf07aff (diff)
downloadvirt-bootstrap.git-f389756a192b6b6ad0951856d8681cc2077ccf6b.tar.gz
virt-bootstrap.git-f389756a192b6b6ad0951856d8681cc2077ccf6b.tar.xz
virt-bootstrap.git-f389756a192b6b6ad0951856d8681cc2077ccf6b.zip
docker-source: Support blobs without .tar ext
Since skopeo v0.1.29 [1] blobs are saved without the .tar extension. This commit changes the docker-source module to handle both cases (with or without .tar extension) [1] commit: projectatomic/skopeo@43acc74 Fix skopeo tests with changes to dir transport The dir transport has been changed to save the blobs without the .tar extension Fixes the skopeo tests failing due to this change Signed-off-by: Radostin Stoyanov <rstoyanov1@gmail.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/docker_source.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/docker_source.py b/tests/docker_source.py
index 0521322..585b9d2 100644
--- a/tests/docker_source.py
+++ b/tests/docker_source.py
@@ -368,9 +368,9 @@ class TestDockerSource(unittest.TestCase):
}
expected_result = [
- ['/images_path/a7050fc1.tar', None],
- ['/images_path/c6ff40b6.tar', None],
- ['/images_path/75c416ea.tar', None]
+ ['/images_path/a7050fc1', None],
+ ['/images_path/c6ff40b6', None],
+ ['/images_path/75c416ea', None]
]
with mock.patch('os.path.getsize') as m_getsize: