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

Update docker-py to 1.4.0
This commit is contained in:
mnowster 2015-09-15 15:31:52 +01:00
commit e33ab0cdd8
3 changed files with 3 additions and 3 deletions

View file

@ -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')