From: Fam Zheng <famz@redhat.com>
Date: Wed, 21 Sep 2016 03:49:27 +0000 (+0800)
Subject: docker: Terminate instances at SIGTERM and SIGHUP
X-Git-Tag: v2.8.0-rc0~121^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97cba1a1d1e62ea3e2718ad22188d10f2aa5478d;p=thirdparty%2Fqemu.git

docker: Terminate instances at SIGTERM and SIGHUP

Signed-off-by: Fam Zheng <famz@redhat.com>
Message-Id: <1474429768-25027-9-git-send-email-famz@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
---

diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 71b0d27e18e..37d83199e7c 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):