summaryrefslogtreecommitdiff
path: root/tests/integration
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2016-08-03 16:48:41 -0700
committerJoffrey F <joffrey@docker.com>2016-08-03 16:48:41 -0700
commit9d48b4f60323db22c45437892e450bf8e545d3ef (patch)
treea22d3d7e3bb0783697952707efc0b6295774a5da /tests/integration
parent67098f38df6606ab7c75d7db64c1552efbda8f49 (diff)
downloaddocker-py-test_fixes_1.12.tar.gz
Test fixes and updated Makefile for 1.12 testingtest_fixes_1.12
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/integration')
-rw-r--r--tests/integration/container_test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py
index 61b3398..f347c12 100644
--- a/tests/integration/container_test.py
+++ b/tests/integration/container_test.py
@@ -292,7 +292,7 @@ class CreateContainerTest(helpers.BaseTestCase):
)
self.client.start(container)
- assert expected_msg in str(excinfo.value)
+ assert six.b(expected_msg) in excinfo.value.explanation
def test_valid_no_log_driver_specified(self):
log_config = docker.utils.LogConfig(