[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe us
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage |
Date: |
Thu, 21 Jun 2018 07:25:59 +0100 |
The "images" command is a fairly heavyweight command to run as it
involves searching the whole docker file-system inventory. On a
machine with a lot of images this makes start-up fairly expensive.
Signed-off-by: Alex Bennée <address@hidden>
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index b28ad87034..e6437d64a7 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -52,7 +52,9 @@ def _guess_docker_command():
commands = [["docker"], ["sudo", "-n", "docker"]]
for cmd in commands:
try:
- if subprocess.call(cmd + ["images"],
+ # docker version will return the client details in stdout
+ # but still report a status of 1 if it can't contact the daemon
+ if subprocess.call(cmd + ["version"],
stdout=DEVNULL, stderr=DEVNULL) == 0:
return cmd
except OSError:
--
2.17.1
- [Qemu-devel] [PULL v2 38/57] tests/tcg: enable building for sh4, (continued)
- [Qemu-devel] [PULL v2 38/57] tests/tcg: enable building for sh4, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 41/57] tests/tcg: enable building for RISCV64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 54/57] tests/Makefile: call sub-makes with SKIP_DOCKER_BUILD=1, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 52/57] docker: docker.py don't conflate checksums for extra_files, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 55/57] docker: docker.py adding age check command, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 21/57] tests/tcg/i386/test-i386: use modern vector_size attributes, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 43/57] tests/tcg: enable building for PowerPC, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 57/57] .travis.yml: add check-tcg test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 32/57] tests/tcg: enable building for s390x, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 17/57] tests/tcg/i386: Build fix for hello-i386, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage,
Alex Bennée <=
- [Qemu-devel] [PULL v2 25/57] tests/tcg/arm: fix up test-arm-iwmmxt test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 39/57] tests/tcg: enable building for sparc64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 49/57] tests/tcg/i386: extend timeout for runcom test, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 56/57] tests/docker/Makefile.include: only force SID to NOCACHE if old, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 44/57] tests/tcg/Makefile: update to be called from Makefile.target, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 47/57] tests/tcg: add run, diff, and skip helper macros, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 15/57] tests/tcg: move i386 specific tests into subdir, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 33/57] tests/tcg: enable building for ppc64, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 45/57] Makefile.target: add (clean-/build-)guest-tests targets, Alex Bennée, 2018/06/21
- [Qemu-devel] [PULL v2 19/57] tests/tcg/i386: add runner for test-i386-fprem, Alex Bennée, 2018/06/21