Message ID | 20180621062605.941-52-alex.bennee@linaro.org |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=<UNKNOWN>) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="j/5pCRbV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41BC264QRfz9s0W for <incoming@patchwork.ozlabs.org>; Thu, 21 Jun 2018 16:47:58 +1000 (AEST) Received: from localhost ([::1]:53349 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1fVtNs-0000qM-60 for incoming@patchwork.ozlabs.org; Thu, 21 Jun 2018 02:47:56 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54406) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt8R-0005hQ-U6 for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:32:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt8R-0003lo-2R for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:31:59 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34393) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <alex.bennee@linaro.org>) id 1fVt8Q-0003l3-Rd for qemu-devel@nongnu.org; Thu, 21 Jun 2018 02:31:58 -0400 Received: by mail-wr0-x242.google.com with SMTP id a12-v6so1855564wro.1 for <qemu-devel@nongnu.org>; Wed, 20 Jun 2018 23:31:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zz0a/EjjRDgcgE0v1Yva2KL8EenOhHXDz/OCw+JetY8=; b=j/5pCRbVsyHnftiu8WPujuGLJci3HdxMWCbjD2jc68ydPfL9ZlE1o35PLQsirtSq/n MVLMOkzEyYjflsVZiwz22nr+J4iGGwLEc21MuKCBXNcqBhXihgg+TGxwViy++O06dI+Q EXeR5PT2sv1gCKfWc/bBuV+ou7f/Gigp6sjIg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zz0a/EjjRDgcgE0v1Yva2KL8EenOhHXDz/OCw+JetY8=; b=o6zyAaVfjQhPwAtAdq7dVOY4vdAWFPi/X76d5jqUQTrQIi1izFxZtkX6h1yhqqTBil +D0KyUe8C7sd5YVigORUusiOuJ8sTaKziY53N6cLc8Wcs8oT/u41eSggA2BeN0J7wogh ikhwRLdvF8ZWlF/uwkXMsgJtFFNtMZTE7IyeuSq+705lnc3pq2vpPz1XnBvDMqBrx2M8 PpBcSOw66dlZgx5QD9xu5Gu1PhHGnbseEiTXc2OOD6nURg/s6OG2Za+eb8Z44/QiwwPk p8CuFQvb5sJh8r6tPaWAJxVH4fQxynMBaPmwWprBt/nplNzO1BvnF4wmQr2bnG/v1Rdo nkPg== X-Gm-Message-State: APt69E2YV1iYDwmH2NyEl74KEpgy4zLTWlT7p91l+KfG6UK0zq9+9Z6Z lCJT3ZUB0d/qQMYz25pH4umJrA== X-Google-Smtp-Source: AAOMgpcOpFPZFg9AlndnG9+jNpN6gg9pzbHXngnbtBqRcSRWcfl6NAx//0gPg6vCebXxmqkw864VDQ== X-Received: by 2002:adf:db91:: with SMTP id u17-v6mr34502wri.217.1529562717817; Wed, 20 Jun 2018 23:31:57 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s191-v6sm8403620wmd.27.2018.06.20.23.31.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 20 Jun 2018 23:31:55 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A9FD03E0158; Thu, 21 Jun 2018 07:26:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Thu, 21 Jun 2018 07:25:59 +0100 Message-Id: <20180621062605.941-52-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180621062605.941-1-alex.bennee@linaro.org> References: <20180621062605.941-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PULL v2 51/57] docker: docker.py use "version" to probe usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> |
Series |
[PULL,v2,01/57] docker: docker.py wrap StringIO import for python3
|
expand
|
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:
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 <alex.bennee@linaro.org>