diff options
| author | Cecile Tonglet <cecile.tonglet@gmail.com> | 2017-08-01 12:16:56 +0200 |
|---|---|---|
| committer | Joffrey F <f.joffrey@gmail.com> | 2017-08-17 13:38:40 -0700 |
| commit | 9e793806ff79559c3bc591d8c52a3bbe3cdb7350 (patch) | |
| tree | 339c399b1db4813bf0775d3f28c279773a63fb88 | |
| parent | f3374959b7145d0c25042d51065b5d387832d19c (diff) | |
| download | docker-py-9e793806ff79559c3bc591d8c52a3bbe3cdb7350.tar.gz | |
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 <cecile.tonglet@gmail.com>
| -rw-r--r-- | docker/api/image.py | 4 | ||||
| -rw-r--r-- | tests/integration/api_image_test.py | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/docker/api/image.py b/docker/api/image.py index 181c4a1..85ff435 100644 --- a/docker/api/image.py +++ b/docker/api/image.py @@ -272,7 +272,7 @@ class ImageApiMixin(object): data (binary): Image data to be loaded. """ res = self._post(self._url("/images/load"), data=data) - self._raise_for_status(res) + return self._result(res, True) @utils.minimum_version('1.25') def prune_images(self, filters=None): @@ -455,7 +455,7 @@ class ImageApiMixin(object): """ params = {'force': force, 'noprune': noprune} res = self._delete(self._url("/images/{0}", image), params=params) - self._raise_for_status(res) + return self._result(res, True) def search(self, term): """ diff --git a/tests/integration/api_image_test.py b/tests/integration/api_image_test.py index 917bc50..192e6f8 100644 --- a/tests/integration/api_image_test.py +++ b/tests/integration/api_image_test.py @@ -113,7 +113,8 @@ class RemoveImageTest(BaseAPIIntegrationTest): self.assertIn('Id', res) img_id = res['Id'] self.tmp_imgs.append(img_id) - self.client.remove_image(img_id, force=True) + logs = self.client.remove_image(img_id, force=True) + self.assertIn({"Deleted": img_id}, logs) images = self.client.images(all=True) res = [x for x in images if x['Id'].startswith(img_id)] self.assertEqual(len(res), 0) |