From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37833) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnIlh-0001wx-Fg for qemu-devel@nongnu.org; Fri, 23 Sep 2016 01:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bnIld-0007RK-8Z for qemu-devel@nongnu.org; Fri, 23 Sep 2016 01:11:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42656) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bnIld-0007RA-2B for qemu-devel@nongnu.org; Fri, 23 Sep 2016 01:11:21 -0400 From: Fam Zheng Date: Fri, 23 Sep 2016 13:10:29 +0800 Message-Id: <1474607430-26500-23-git-send-email-famz@redhat.com> In-Reply-To: <1474607430-26500-1-git-send-email-famz@redhat.com> References: <1474607430-26500-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PULL 22/23] docker: Terminate instances at SIGTERM and SIGHUP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell Signed-off-by: Fam Zheng Message-Id: <1474429768-25027-9-git-send-email-famz@redhat.com> Reviewed-by: Daniel P. Berrange --- 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 71b0d27..37d8319 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 @@ -101,6 +102,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: @@ -133,7 +136,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): -- 2.7.4