Merge pull request #2031 from aanand/docker-py-1.4.0

Update docker-py to 1.4.0

requirements.txt

@@ -1,5 +1,5 @@
 PyYAML==3.10
-docker-py==1.3.1
+docker-py==1.4.0
 dockerpty==0.3.4
 docopt==0.6.1
 enum34==1.0.4

setup.py

@@ -33,7 +33,7 @@ install_requires = [
     'requests >= 2.6.1, < 2.8',
     'texttable >= 0.8.1, < 0.9',
     'websocket-client >= 0.32.0, < 1.0',
-    'docker-py >= 1.3.1, < 1.4',
+    'docker-py >= 1.4.0, < 2',
     'dockerpty >= 0.3.4, < 0.4',
     'six >= 1.3.0, < 2',
     'jsonschema >= 2.5.1, < 3',

tests/integration/service_test.py

@@ -864,7 +864,7 @@ class ServiceTest(DockerClientTestCase):
 
     def test_log_drive_invalid(self):
         service = self.create_service('web', log_driver='xxx')
-        self.assertRaises(ValueError, lambda: create_and_start_container(service))
+        self.assertRaises(APIError, lambda: create_and_start_container(service))
 
     def test_log_drive_empty_default_jsonfile(self):
         service = self.create_service('web')