[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/23] docker: Terminate instances at SIGTERM and SIG
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 22/23] docker: Terminate instances at SIGTERM and SIGHUP |
Date: |
Fri, 23 Sep 2016 13:10:29 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Daniel P. Berrange <address@hidden>
---
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
- [Qemu-devel] [PULL 13/23] Add UUID files to MAINTAINERS, (continued)
- [Qemu-devel] [PULL 13/23] Add UUID files to MAINTAINERS, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 12/23] tests: Add uuid tests, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 14/23] tests: Ignore test-uuid, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 15/23] docker: Generate /packages.txt in centos6 image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 16/23] docker: Generate /packages.txt in fedora image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 17/23] docker: Generate /packages.txt in ubuntu image, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 18/23] docker: Update fedora image to latest, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 19/23] docker: Flatten default target list in test-quick, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 20/23] docker: Print used options before doing configure, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 21/23] docker: Support showing environment information, Fam Zheng, 2016/09/23
- [Qemu-devel] [PULL 22/23] docker: Terminate instances at SIGTERM and SIGHUP,
Fam Zheng <=
- [Qemu-devel] [PULL 23/23] docker: exec $CMD, Fam Zheng, 2016/09/23
- Re: [Qemu-devel] [PULL 00/23] Various patches, Peter Maydell, 2016/09/23