From f389756a192b6b6ad0951856d8681cc2077ccf6b Mon Sep 17 00:00:00 2001 From: Radostin Stoyanov Date: Tue, 24 Apr 2018 09:03:34 +0100 Subject: 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 --- tests/docker_source.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'tests/docker_source.py') 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: -- cgit