diff options
| author | Joffrey F <joffrey@docker.com> | 2018-01-29 17:07:15 -0800 |
|---|---|---|
| committer | Joffrey F <joffrey@docker.com> | 2018-01-30 17:16:23 -0800 |
| commit | e304f91b4636b59a056ff795d91895c725c6255f (patch) | |
| tree | af96522c00d38e29850ecd8090f427e48030df94 /tests/integration/api_exec_test.py | |
| parent | dd858648a0942177995a74e1eda3468a720a3c58 (diff) | |
| download | docker-py-mtsmfm-master.tar.gz | |
Update detach tests to work with AF_INET as wellmtsmfm-master
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'tests/integration/api_exec_test.py')
| -rw-r--r-- | tests/integration/api_exec_test.py | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/tests/integration/api_exec_test.py b/tests/integration/api_exec_test.py index 1a9542e..1a5a4e5 100644 --- a/tests/integration/api_exec_test.py +++ b/tests/integration/api_exec_test.py @@ -3,7 +3,7 @@ from docker.utils.socket import read_exactly from .base import BaseAPIIntegrationTest, BUSYBOX from ..helpers import ( - requires_api_version, ctrl_with, assert_socket_closed_with_keys + requires_api_version, ctrl_with, assert_cat_socket_detached_with_keys ) @@ -152,42 +152,54 @@ class ExecTest(BaseAPIIntegrationTest): assert exec_log == b'/var/www\n' def test_detach_with_default(self): - container = self.client.create_container(BUSYBOX, 'cat', - detach=True, stdin_open=True) + container = self.client.create_container( + BUSYBOX, 'cat', detach=True, stdin_open=True + ) id = container['Id'] self.client.start(id) self.tmp_containers.append(id) - exec_id = self.client.exec_create(id, '/bin/sh', stdin=True, tty=True) + exec_id = self.client.exec_create( + id, 'cat', stdin=True, tty=True, stdout=True + ) sock = self.client.exec_start(exec_id, tty=True, socket=True) + self.addCleanup(sock.close) - assert_socket_closed_with_keys(sock, [ctrl_with('p'), ctrl_with('q')]) + assert_cat_socket_detached_with_keys( + sock, [ctrl_with('p'), ctrl_with('q')] + ) def test_detach_with_config_file(self): self.client._general_configs['detachKeys'] = 'ctrl-p' - container = self.client.create_container(BUSYBOX, 'cat', - detach=True, stdin_open=True) + container = self.client.create_container( + BUSYBOX, 'cat', detach=True, stdin_open=True + ) id = container['Id'] self.client.start(id) self.tmp_containers.append(id) - exec_id = self.client.exec_create(id, '/bin/sh', stdin=True, tty=True) + exec_id = self.client.exec_create( + id, 'cat', stdin=True, tty=True, stdout=True + ) sock = self.client.exec_start(exec_id, tty=True, socket=True) + self.addCleanup(sock.close) - assert_socket_closed_with_keys(sock, [ctrl_with('p')]) + assert_cat_socket_detached_with_keys(sock, [ctrl_with('p')]) def test_detach_with_arg(self): self.client._general_configs['detachKeys'] = 'ctrl-p' - container = self.client.create_container(BUSYBOX, 'cat', - detach=True, stdin_open=True) + container = self.client.create_container( + BUSYBOX, 'cat', detach=True, stdin_open=True + ) id = container['Id'] self.client.start(id) self.tmp_containers.append(id) exec_id = self.client.exec_create( - id, '/bin/sh', - stdin=True, tty=True, detach_keys='ctrl-x' + id, 'cat', + stdin=True, tty=True, detach_keys='ctrl-x', stdout=True ) sock = self.client.exec_start(exec_id, tty=True, socket=True) + self.addCleanup(sock.close) - assert_socket_closed_with_keys(sock, [ctrl_with('x')]) + assert_cat_socket_detached_with_keys(sock, [ctrl_with('x')]) |