Merge branch 'raise-on-inspect-empty-string-602' of https://github.com/posita/docker-py into posita-raise-on-inspect-empty-string-602

Author: shin-

docker/client.py

@@ -747,6 +747,8 @@ def inspect_container(self, container):
 
     @check_resource
     def inspect_image(self, image):
+        if isinstance(image, dict):
+            image = image.get('Id')
         return self._result(
             self._get(self._url("/images/{0}/json".format(image))),
             True

docker/utils/decorators.py

@@ -12,5 +12,7 @@ def wrapped(self, resource_id=None, *args, **kwargs):
                 raise errors.NullResource(
                     'image or container param is undefined'
                 )
+        if not resource_id:
+            raise ValueError('image or container param is empty')
         return f(self, resource_id, *args, **kwargs)
     return wrapped

tests/test.py

@@ -1782,6 +1782,12 @@ def test_inspect_container(self):
         except Exception as e:
             self.fail('Command should not raise exception: {0}'.format(e))
 
+        try:
+            self.client.inspect_container('')
+        except ValueError as e:
+            self.assertEqual(e.args[0],
+                             'image or container param is empty')
+
         fake_request.assert_called_with(
             url_prefix + 'containers/3cc2351ab11b/json',
             timeout=DEFAULT_TIMEOUT_SECONDS
@@ -1953,6 +1959,12 @@ def test_inspect_image(self):
         except Exception as e:
             self.fail('Command should not raise exception: {0}'.format(e))
 
+        try:
+            self.client.inspect_image('')
+        except ValueError as e:
+            self.assertEqual(e.args[0],
+                             'image or container param is empty')
+
         fake_request.assert_called_with(
             url_prefix + 'images/test_image/json',
             timeout=DEFAULT_TIMEOUT_SECONDS