Merge branch 'master' into 0.6.0-release

docker/client.py

@@ -877,6 +877,8 @@ class Client(requests.Session):
         self._raise_for_status(res)
 
     def remove_image(self, image, force=False, noprune=False):
+        if isinstance(image, dict):
+            image = image.get('Id')
         params = {'force': force, 'noprune': noprune}
         res = self._delete(self._url("/images/" + image), params=params)
         self._raise_for_status(res)

tests/utils_test.py

@@ -72,9 +72,9 @@ class UtilsTest(unittest.TestCase):
                           DOCKER_TLS_VERIFY='1')
         kwargs = kwargs_from_env(assert_hostname=False)
         self.assertEquals('https://192.168.59.103:2376', kwargs['base_url'])
-        self.assertIn('ca.pem', kwargs['tls'].verify)
-        self.assertIn('cert.pem', kwargs['tls'].cert[0])
-        self.assertIn('key.pem', kwargs['tls'].cert[1])
+        self.assertTrue('ca.pem' in kwargs['tls'].verify)
+        self.assertTrue('cert.pem' in kwargs['tls'].cert[0])
+        self.assertTrue('key.pem' in kwargs['tls'].cert[1])
         self.assertEquals(False, kwargs['tls'].assert_hostname)
         try:
             client = Client(**kwargs)