diff options
Diffstat (limited to 'tests/integration/container_test.py')
-rw-r--r-- | tests/integration/container_test.py | 43 |
1 files changed, 28 insertions, 15 deletions
diff --git a/tests/integration/container_test.py b/tests/integration/container_test.py index 9606e14..58a12d9 100644 --- a/tests/integration/container_test.py +++ b/tests/integration/container_test.py @@ -632,24 +632,24 @@ Line2''' exitcode = self.client.wait(id) self.assertEqual(exitcode, 0) logs = self.client.logs(id, tail=1) - self.assertEqual(logs, ('Line2\n').encode(encoding='ascii')) + self.assertEqual(logs, 'Line2\n'.encode(encoding='ascii')) -# def test_logs_streaming(self): -# snippet = 'Flowering Nights (Sakuya Iyazoi)' -# container = self.client.create_container( -# BUSYBOX, 'echo {0}'.format(snippet) -# ) -# id = container['Id'] -# self.client.start(id) -# self.tmp_containers.append(id) -# logs = bytes() if six.PY3 else str() -# for chunk in self.client.logs(id, stream=True): -# logs += chunk + def test_logs_streaming(self): + snippet = 'Flowering Nights (Sakuya Iyazoi)' + container = self.client.create_container( + BUSYBOX, 'echo {0}'.format(snippet) + ) + id = container['Id'] + self.client.start(id) + self.tmp_containers.append(id) + logs = bytes() if six.PY3 else str() + for chunk in self.client.logs(id, stream=True): + logs += chunk -# exitcode = self.client.wait(id) -# self.assertEqual(exitcode, 0) + exitcode = self.client.wait(id) + self.assertEqual(exitcode, 0) -# self.assertEqual(logs, (snippet + '\n').encode(encoding='ascii')) + self.assertEqual(logs, (snippet + '\n').encode(encoding='ascii')) def test_logs_with_dict_instead_of_id(self): snippet = 'Flowering Nights (Sakuya Iyazoi)' @@ -664,6 +664,19 @@ Line2''' logs = self.client.logs(container) self.assertEqual(logs, (snippet + '\n').encode(encoding='ascii')) + def test_logs_with_tail_0(self): + snippet = 'Flowering Nights (Sakuya Iyazoi)' + container = self.client.create_container( + BUSYBOX, 'echo "{0}"'.format(snippet) + ) + id = container['Id'] + self.client.start(id) + self.tmp_containers.append(id) + exitcode = self.client.wait(id) + self.assertEqual(exitcode, 0) + logs = self.client.logs(id, tail=0) + self.assertEqual(logs, ''.encode(encoding='ascii')) + class DiffTest(api_test.BaseTestCase): def test_diff(self): |