Merge pull request #12949 from vzakaznikov/increase_timeouts_in_testflows_tests

increasing timeouts in testflows tests
This commit is contained in:
alexey-milovidov 2020-07-28 14:40:01 +03:00 committed by GitHub
commit ee11c10087
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -167,17 +167,20 @@ class Cluster(object):
self.docker_compose += f" --project-directory \"{docker_compose_project_dir}\" --file \"{docker_compose_file_path}\""
self.lock = threading.Lock()
def shell(self, node):
def shell(self, node, timeout=120):
"""Returns unique shell terminal to be used.
"""
if node is None:
return Shell()
return Shell(command=[
shell = Shell(command=[
"/bin/bash", "--noediting", "-c", f"{self.docker_compose} exec {node} bash --noediting"
], name=node)
def bash(self, node, timeout=60):
shell.timeout = timeout
return shell
def bash(self, node, timeout=120):
"""Returns thread-local bash terminal
to a specific node.