Merge branch 'master' into tls-fixes

This commit is contained in:
Joffrey F 2016-03-15 10:35:53 -07:00
commit 8e93abf271
1 changed files with 5 additions and 6 deletions

View File

@ -280,15 +280,14 @@ class CreateContainerTest(helpers.BaseTestCase):
config={}
)
container = self.client.create_container(
BUSYBOX, ['true'],
host_config=self.client.create_host_config(log_config=log_config)
)
expected_msg = "logger: no log driver named 'asdf-nope' is registered"
with pytest.raises(docker.errors.APIError) as excinfo:
# raises an internal server error 500
container = self.client.create_container(
BUSYBOX, ['true'], host_config=self.client.create_host_config(
log_config=log_config
)
)
self.client.start(container)
assert expected_msg in str(excinfo.value)