diff options
author | Joffrey F <f.joffrey@gmail.com> | 2016-03-15 10:35:53 -0700 |
---|---|---|
committer | Joffrey F <f.joffrey@gmail.com> | 2016-03-15 10:35:53 -0700 |
commit | 8e93abf27125cc10f78fc2f52280682b3fc7ad5e (patch) | |
tree | c5ddb25ad50e372a32052533f93fe30bdf0a1f3c | |
parent | ad480ff0b16907c8cfea5aa4cc6fe9b8bc5d2494 (diff) | |
parent | fa7068cb7cf2ae1efcc2b3b99f24f4c7aa29e989 (diff) | |
download | docker-py-8e93abf27125cc10f78fc2f52280682b3fc7ad5e.tar.gz |
Merge branch 'master' into tls-fixestls-fixes
-rw-r--r-- | tests/integration/container_test.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py index 6120135..a1498f9 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -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) |