summaryrefslogtreecommitdiff
path: root/docker/api
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-09-10 18:37:05 -0700
committerJoffrey F <joffrey@docker.com>2015-09-16 12:54:26 -0700
commit05267f63d355ae04ea7bd4797847dead8c2f71c3 (patch)
tree387b675fc01babb8160228a267d103ca25f309d9 /docker/api
parent46eb23b4f3fb0bf03a06b64e2872703659b0c006 (diff)
downloaddocker-py-05267f63d355ae04ea7bd4797847dead8c2f71c3.tar.gz
Modify unit tests suite to allow mock routes to optionally be method-aware
Added mock API routes for volumes API Add unit tests and integration tests for volume API Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker/api')
-rw-r--r--docker/api/volume.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/api/volume.py b/docker/api/volume.py
index 4e005b8..708cbe5 100644
--- a/docker/api/volume.py
+++ b/docker/api/volume.py
@@ -27,7 +27,7 @@ class VolumeApiMixin(object):
@check_api_version
def create_volume(self, name, driver=None, driver_opts=None):
url = self._url('/volumes')
- if not isinstance(driver_opts, dict):
+ if driver_opts is not None and not isinstance(driver_opts, dict):
raise TypeError('driver_opts must be a dictionary')
data = {
@@ -35,7 +35,7 @@ class VolumeApiMixin(object):
'Driver': driver,
'DriverOpts': driver_opts,
}
- return self._result(self._post(url, data=data), True)
+ return self._result(self._post_json(url, data=data), True)
@check_api_version
def inspect_volume(self, name):
@@ -45,4 +45,6 @@ class VolumeApiMixin(object):
@check_api_version
def remove_volume(self, name):
url = self._url('/volumes/{0}', name)
- return self._result(self._delete(url), True)
+ resp = self._delete(url)
+ self._raise_for_status(resp)
+ return True