Kaydet (Commit) 515db1f6 authored tarafından Tomas Tomecek's avatar Tomas Tomecek

exec: fix running with detach=True

Fixes #1271
Signed-off-by: 's avatarTomas Tomecek <ttomecek@redhat.com>
üst 6a16edee
...@@ -137,7 +137,8 @@ class ExecApiMixin(object): ...@@ -137,7 +137,8 @@ class ExecApiMixin(object):
data=data, data=data,
stream=True stream=True
) )
if detach:
return self._result(res)
if socket: if socket:
return self._get_raw_response_socket(res) return self._get_raw_response_socket(res)
return self._read_from_socket(res, stream) return self._read_from_socket(res, stream)
...@@ -93,6 +93,21 @@ class ExecTest(BaseAPIIntegrationTest): ...@@ -93,6 +93,21 @@ class ExecTest(BaseAPIIntegrationTest):
data = read_exactly(socket, next_size) data = read_exactly(socket, next_size)
self.assertEqual(data.decode('utf-8'), line) self.assertEqual(data.decode('utf-8'), line)
def test_exec_start_detached(self):
container = self.client.create_container(BUSYBOX, 'cat',
detach=True, stdin_open=True)
container_id = container['Id']
self.client.start(container_id)
self.tmp_containers.append(container_id)
exec_id = self.client.exec_create(
container_id, ['printf', "asdqwe"])
self.assertIn('Id', exec_id)
response = self.client.exec_start(exec_id, detach=True)
self.assertEqual(response, "")
def test_exec_inspect(self): def test_exec_inspect(self):
container = self.client.create_container(BUSYBOX, 'cat', container = self.client.create_container(BUSYBOX, 'cat',
detach=True, stdin_open=True) detach=True, stdin_open=True)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment