summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-09-10 11:37:51 -0700
committerJoffrey F <joffrey@docker.com>2015-09-10 11:37:51 -0700
commit7e3cdfb3b14bfab6c0a5363a56fd26140d5d516b (patch)
tree00deafa61e0177b57c17d64d02bc7c8536b195bf /tests
parent9372ef27f89ce6a89bdb46c19b72e531f95017c1 (diff)
downloaddocker-py-1.4.0-release.tar.gz
Fixed regression test in py3 environments1.4.0-release
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/integration_test.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tests/integration_test.py b/tests/integration_test.py
index 6d44d07..adbff84 100644
--- a/tests/integration_test.py
+++ b/tests/integration_test.py
@@ -1626,4 +1626,7 @@ class TestRegressions(BaseTestCase):
ctnr = self.client.create_container('busybox', ['id', '-u'], user=1000)
self.client.start(ctnr)
self.client.wait(ctnr)
- assert self.client.logs(ctnr) == '1000\n'
+ logs = self.client.logs(ctnr)
+ if six.PY3:
+ logs = logs.decode('utf-8')
+ assert logs == '1000\n'