docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Joffrey F 2015-05-20 14:37:44 -07:00
parent 4aa2fa649f de2f58d818
commit 86297c825d
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/client.py
View File

@ -747,6 +747,8 @@ class Client(requests.Session):
@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

2
docker/utils/decorators.py
View File

@ -12,5 +12,7 @@ def check_resource(f):
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

12
tests/test.py
View File

@ -1782,6 +1782,12 @@ class DockerClientTest(Cleanup, base.BaseTestCase):
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 @@ class DockerClientTest(Cleanup, base.BaseTestCase):
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