Skip to content

Commit 9e79380

Browse files
cectonshin-
authored andcommitted
Return the result of the API when using remove_image and load_image
Those calls return result that can be used by the developers. Signed-off-by: Cecile Tonglet <[email protected]>
1 parent f337495 commit 9e79380

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

docker/api/image.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ def load_image(self, data):
272272
data (binary): Image data to be loaded.
273273
"""
274274
res = self._post(self._url("/images/load"), data=data)
275-
self._raise_for_status(res)
275+
return self._result(res, True)
276276

277277
@utils.minimum_version('1.25')
278278
def prune_images(self, filters=None):
@@ -455,7 +455,7 @@ def remove_image(self, image, force=False, noprune=False):
455455
"""
456456
params = {'force': force, 'noprune': noprune}
457457
res = self._delete(self._url("/images/{0}", image), params=params)
458-
self._raise_for_status(res)
458+
return self._result(res, True)
459459

460460
def search(self, term):
461461
"""

tests/integration/api_image_test.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ def test_remove(self):
113113
self.assertIn('Id', res)
114114
img_id = res['Id']
115115
self.tmp_imgs.append(img_id)
116-
self.client.remove_image(img_id, force=True)
116+
logs = self.client.remove_image(img_id, force=True)
117+
self.assertIn({"Deleted": img_id}, logs)
117118
images = self.client.images(all=True)
118119
res = [x for x in images if x['Id'].startswith(img_id)]
119120
self.assertEqual(len(res), 0)

0 commit comments

Comments
 (0)