summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilson Júnior <wilsonpjunior@gmail.com>2020-04-17 09:37:34 -0300
committerUlysses Souza <ulyssessouza@gmail.com>2020-06-02 15:52:25 +0200
commit9b59e4911309dc1e9ff9017f2adad8bad8060e80 (patch)
treeb933fc931b545093def391b7c495e48e9180eac8
parent913d129dc9e5cb84bfe385a1b58badfae48e1344 (diff)
downloaddocker-py-9b59e4911309dc1e9ff9017f2adad8bad8060e80.tar.gz
Fix tests to support both log plugin feedbacks
Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com> Docker-DCO-1.1-Signed-off-by: Wilson Júnior <wilsonpjunior@gmail.com> (github: wpjunior)
-rw-r--r--tests/integration/api_container_test.py9
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/integration/api_container_test.py b/tests/integration/api_container_test.py
index c503a36..411d4c2 100644
--- a/tests/integration/api_container_test.py
+++ b/tests/integration/api_container_test.py
@@ -273,11 +273,14 @@ class CreateContainerTest(BaseAPIIntegrationTest):
def test_invalid_log_driver_raises_exception(self):
log_config = docker.types.LogConfig(
- type='asdf-nope',
+ type='asdf',
config={}
)
- expected_msg = "logger: no log driver named 'asdf-nope' is registered"
+ expected_msgs = [
+ "logger: no log driver named 'asdf' is registered",
+ "looking up logging plugin asdf: plugin \"asdf\" not found",
+ ]
with pytest.raises(docker.errors.APIError) as excinfo:
# raises an internal server error 500
container = self.client.create_container(
@@ -287,7 +290,7 @@ class CreateContainerTest(BaseAPIIntegrationTest):
)
self.client.start(container)
- assert excinfo.value.explanation == expected_msg
+ assert excinfo.value.explanation in expected_msgs
def test_valid_no_log_driver_specified(self):
log_config = docker.types.LogConfig(