OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/docker: reduce scary warnings by cleaning up clean up

Browse Source 
There was in the clean-up code caused by attempting to inspect images
which finished before we got there. Clean up the clean up code by:

  - only track the one instance at a time
  - use --filter for docker ps instead of doing it by hand
  - just call docker rm -f to be done with it
  - use uuid.uuid4() for a random uid

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Alex Bennée 2019-09-19 17:51:27 +01:00
parent 5fac0cfaaa
commit 529994e204
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/docker/docker.py
View File

@ -215,7 +215,7 @@ class Docker(object):
""" Running Docker commands """ """ Running Docker commands """
def __init__(self): def __init__(self):
self._command = _guess_engine_command() self._command = _guess_engine_command()
self._instances = [] self._instance = None
atexit.register(self._kill_instances) atexit.register(self._kill_instances)
signal.signal(signal.SIGTERM, self._kill_instances) signal.signal(signal.SIGTERM, self._kill_instances)
signal.signal(signal.SIGHUP, self._kill_instances) signal.signal(signal.SIGHUP, self._kill_instances)
@ -234,21 +234,19 @@ class Docker(object):
cmd = ["ps", "-q"] cmd = ["ps", "-q"]
if not only_active: if not only_active:
cmd.append("-a") cmd.append("-a")
filter = "--filter=label=com.qemu.instance.uuid"
if only_known:
if self._instance:
filter += "=%s" % (self._instance)
else:
# no point trying to kill, we finished
return
print("filter=%s" % (filter))
cmd.append(filter)
for i in self._output(cmd).split(): for i in self._output(cmd).split():
resp = self._output(["inspect", i]) self._do(["rm", "-f", i])
labels = json.loads(resp)[0]["Config"]["Labels"]
active = json.loads(resp)[0]["State"]["Running"]
if not labels:
continue
instance_uuid = labels.get("com.qemu.instance.uuid", None)
if not instance_uuid:
continue
if only_known and instance_uuid not in self._instances:
continue
print("Terminating", i)
if active:
self._do(["kill", i])
self._do(["rm", i])
def clean(self): def clean(self):
self._do_kill_instances(False, False) self._do_kill_instances(False, False)
@ -325,9 +323,9 @@ class Docker(object):
return checksum == _text_checksum(_dockerfile_preprocess(dockerfile)) return checksum == _text_checksum(_dockerfile_preprocess(dockerfile))
def run(self, cmd, keep, quiet, as_user=False): def run(self, cmd, keep, quiet, as_user=False):
label = uuid.uuid1().hex label = uuid.uuid4().hex
if not keep: if not keep:
self._instances.append(label) self._instance = label
if as_user: if as_user:
uid = os.getuid() uid = os.getuid()
@ -340,7 +338,7 @@ class Docker(object):
"com.qemu.instance.uuid=" + label] + cmd, "com.qemu.instance.uuid=" + label] + cmd,
quiet=quiet) quiet=quiet)
if not keep: if not keep:
self._instances.remove(label) self._instance = None
return ret return ret
def command(self, cmd, argv, quiet): def command(self, cmd, argv, quiet):