Merge pull request #9757 from jwhonce/wip/load

Cleanup /libpod/images/load handler

2 files changed, 20 insertions, 6 deletions

diff --git a/test/python/docker/compat/test_images.py b/test/python/docker/compat/test_images.py
index 4a90069a9..571b31881 100644
--- a/test/python/docker/compat/test_images.py
+++ b/test/python/docker/compat/test_images.py
@@ -1,4 +1,5 @@
 import collections
+import io
 import os
 import subprocess
 import sys
@@ -6,6 +7,7 @@ import time
 import unittest
 
 from docker import DockerClient, errors
+from docker.errors import APIError
 
 from test.python.docker import Podman
 from test.python.docker.compat import common, constant
@@ -79,9 +81,7 @@ class TestImages(unittest.TestCase):
         self.assertEqual(len(self.client.images.list()), 2)
 
         # List images with filter
-        self.assertEqual(
-            len(self.client.images.list(filters={"reference": "alpine"})), 1
-        )
+        self.assertEqual(len(self.client.images.list(filters={"reference": "alpine"})), 1)
 
     def test_search_image(self):
         """Search for image"""
@@ -149,15 +149,22 @@ class TestImages(unittest.TestCase):
 
         self.assertEqual(len(self.client.images.list()), 2)
 
+    def test_load_corrupt_image(self):
+        """Import|Load Image failure"""
+        tarball = io.BytesIO("This is a corrupt tarball".encode("utf-8"))
+        with self.assertRaises(APIError):
+            self.client.images.load(tarball)
+
     def test_build_image(self):
         labels = {"apple": "red", "grape": "green"}
-        _ = self.client.images.build(path="test/python/docker/build_labels", labels=labels, tag="labels")
+        _ = self.client.images.build(
+            path="test/python/docker/build_labels", labels=labels, tag="labels"
+        )
         image = self.client.images.get("labels")
         self.assertEqual(image.labels["apple"], labels["apple"])
         self.assertEqual(image.labels["grape"], labels["grape"])
 
 
-
 if __name__ == "__main__":
     # Setup temporary space
     unittest.main()
diff --git a/test/system/120-load.bats b/test/system/120-load.bats
index 95113c4a6..d29be462d 100644
--- a/test/system/120-load.bats
+++ b/test/system/120-load.bats
@@ -32,7 +32,7 @@ verify_iid_and_name() {
     echo "I am an invalid file and should cause a podman-load error" > $invalid
     run_podman 125 load -i $invalid
     # podman and podman-remote emit different messages; this is a common string
-    is "$output" ".*error pulling image: unable to pull .*" \
+    is "$output" ".*payload does not match any of the supported image formats .*" \
        "load -i INVALID fails with expected diagnostic"
 }
 
@@ -137,6 +137,13 @@ verify_iid_and_name() {
        "Diagnostic from 'podman load' without redirection or -i"
 }
 
+@test "podman load - redirect corrupt payload" {
+    run_podman 125 load <<< "Danger, Will Robinson!! This is a corrupt tarball!"
+    is "$output" \
+        ".*payload does not match any of the supported image formats .*" \
+        "Diagnostic from 'podman load' unknown/corrupt payload"
+}
+
 @test "podman load - multi-image archive" {
     img1="quay.io/libpod/testimage:00000000"
     img2="quay.io/libpod/testimage:20200902"