On Wed, Sep 21, 2016 at 11:49:27AM +0800, Fam Zheng wrote: > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > tests/docker/docker.py | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/tests/docker/docker.py b/tests/docker/docker.py > index b85c165..552608e 100755 > --- a/tests/docker/docker.py > +++ b/tests/docker/docker.py > @@ -21,6 +21,7 @@ import uuid > import argparse > import tempfile > import re > +import signal > from tarfile import TarFile, TarInfo > from StringIO import StringIO > from shutil import copy, rmtree > @@ -98,6 +99,8 @@ class Docker(object): > self._command = _guess_docker_command() > self._instances = [] > atexit.register(self._kill_instances) > + signal.signal(signal.SIGTERM, self._kill_instances) > + signal.signal(signal.SIGHUP, self._kill_instances) > > def _do(self, cmd, quiet=True, infile=None, **kwargs): > if quiet: > @@ -130,7 +133,7 @@ class Docker(object): > self._do_kill_instances(False, False) > return 0 > > - def _kill_instances(self): > + def _kill_instances(self, *args, **kwargs): > return self._do_kill_instances(True) > > def _output(self, cmd, **kwargs):
Reviewed-by: Daniel P. Berrange <berra...@redhat.com> Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|
