tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Increase the timeout for all acceptance tests.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
This commit is contained in:
Daniel Nephin 2016-01-15 10:14:55 -05:00
parent dc1104649f
commit 0f1a798f28
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/acceptance/cli_test.py
View File

@ -47,7 +47,7 @@ def wait_on_process(proc, returncode=0):
return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8')) return ProcessResult(stdout.decode('utf-8'), stderr.decode('utf-8'))
def wait_on_condition(condition, delay=0.1, timeout=20): def wait_on_condition(condition, delay=0.1, timeout=40):
start_time = time.time() start_time = time.time()
while not condition(): while not condition():
if time.time() - start_time > timeout: if time.time() - start_time > timeout:
@ -631,14 +631,14 @@ class CLITestCase(DockerClientTestCase):
wait_on_condition(ContainerCountCondition(self.project, 2)) wait_on_condition(ContainerCountCondition(self.project, 2))
os.kill(proc.pid, signal.SIGINT) os.kill(proc.pid, signal.SIGINT)
wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30) wait_on_condition(ContainerCountCondition(self.project, 0))
def test_up_handles_sigterm(self): def test_up_handles_sigterm(self):
proc = start_process(self.base_dir, ['up', '-t', '2']) proc = start_process(self.base_dir, ['up', '-t', '2'])
wait_on_condition(ContainerCountCondition(self.project, 2)) wait_on_condition(ContainerCountCondition(self.project, 2))
os.kill(proc.pid, signal.SIGTERM) os.kill(proc.pid, signal.SIGTERM)
wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30) wait_on_condition(ContainerCountCondition(self.project, 0))
def test_run_service_without_links(self): def test_run_service_without_links(self):
self.base_dir = 'tests/fixtures/links-composefile' self.base_dir = 'tests/fixtures/links-composefile'