jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #2585 from dnephin/short_signal_handlers

Browse source 
Fix signal handlers by moving shutdown logic out of handler
This commit is contained in:
Daniel Nephin 2016-01-12 12:55:53 -05:00
commit 304a44aeab
4 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tests/acceptance/cli_test.py
View file

@ -90,7 +90,8 @@ class ContainerStateCondition(object):
return False
def __str__(self):
return "waiting for container to have state %s" % self.expected
state = 'running' if self.running else 'stopped'
return "waiting for container to be %s" % state
class CLITestCase(DockerClientTestCase):

2
tests/unit/cli/main_test.py
View file

@ -55,7 +55,7 @@ class CLIMainTestCase(unittest.TestCase):
service_names = ['web', 'db']
timeout = 12
with mock.patch('compose.cli.main.signal', autospec=True) as mock_signal:
with mock.patch('compose.cli.main.signals.signal', autospec=True) as mock_signal:
attach_to_logs(project, log_printer, service_names, timeout)
assert mock_signal.signal.mock_calls == [