tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2651 from aanand/increase-signal-test-timeout 

Increase timeout on signal-handling tests
This commit is contained in:
Daniel Nephin 2016-01-13 15:45:34 -05:00
parent ad8faad296 85a210d9eb
commit eced525317
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/acceptance/cli_test.py
View File

@ -454,14 +454,14 @@ class CLITestCase(DockerClientTestCase):
wait_on_condition(ContainerCountCondition(self.project, 2))
os.kill(proc.pid, signal.SIGINT)
wait_on_condition(ContainerCountCondition(self.project, 0))
wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
def test_up_handles_sigterm(self):
proc = start_process(self.base_dir, ['up', '-t', '2'])
wait_on_condition(ContainerCountCondition(self.project, 2))
os.kill(proc.pid, signal.SIGTERM)
wait_on_condition(ContainerCountCondition(self.project, 0))
wait_on_condition(ContainerCountCondition(self.project, 0), timeout=30)
def test_run_service_without_links(self):
self.base_dir = 'tests/fixtures/links-composefile'