From patchwork Tue Jun 19 15:44:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 139216 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5415007lji; Tue, 19 Jun 2018 09:29:34 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJoMopR2fUGxTECmdYaxyyb59+rq4aNS2Vddn63GT+FpoXKU+HrFXaKELxWgeu2h/6ZCCWK X-Received: by 2002:a37:5c01:: with SMTP id q1-v6mr13682917qkb.361.1529425774277; Tue, 19 Jun 2018 09:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529425774; cv=none; d=google.com; s=arc-20160816; b=r0k/dZ0hBMojOTNkjjc0CQMkpq3rfwaI0kK3aXdqjmcq4CNxiMfbnA6a7+08EX9RXG 0VTlxIfUjsGS9K7jHYMwYJRy7KpLJ3tX1NAitvHhCCLAYKx1cTJL/9bhAo1s+2xN3yYv YNd3Q+HbGHgZU4RHNTr0YnO4Ry8yHUy5ZQRIEJz6asuCHVmYaHnWMDacy36kJYz0NZbw aeD3DJrHWFvr2aigLxHeLX70L3qhsKrSayd0Aj52fPf3/7hL6rVCHPlEtuf4ghl5+Lbw UH8F70m2+DvjCvlKI2JIgORFOBjK6i7mjR6nhu6OLJDcgCv9M1PBn9mSn48e+9RUBCNd F5Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=ET+CSKQxqjllrHu59h0vn/aj61cZ2KNVxA7OHOFNObg=; b=dmmx+6td3MnmeltOQosZOYUkWxfeqXLmwLeYOUTwyuazogRZci9hmqZt3ba5B+QGDf 14sOsNSXLuhl7OL724RFDW/SW5BaS+0FHN7+m/l6eqge9z/kQPgpMYV3x09iEhOViS32 5oHxYDPqOiDcxx6cxvlrtLWiPWFOKCGIi5trjt/bB7xrlStJlPAhMqrPGrnrdzH+B4ac KVaDybb4AGKUsvPek+gTygF8XY5NLnA0QVsUr6cn6JKzirJaFI1fsfVPadSu6PYy5Jtv TIeH9ZdYuvuAh9pcUbA+5V72MvY/hWWytDPiugsZ8tp+GVMVD+9KjB6N4HCDJOXRt29C 4PVQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SSNw7HV4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b45-v6si104438qtc.235.2018.06.19.09.29.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:29:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SSNw7HV4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:43632 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJVd-0000ZO-Kl for patch@linaro.org; Tue, 19 Jun 2018 12:29:33 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIvW-0004JC-LX for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvJ-0001tF-6b for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:14 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:50189) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIvI-0001s3-S1 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:01 -0400 Received: by mail-wm0-x242.google.com with SMTP id e16-v6so1229584wmd.0 for ; Tue, 19 Jun 2018 08:52:00 -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=ET+CSKQxqjllrHu59h0vn/aj61cZ2KNVxA7OHOFNObg=; b=SSNw7HV44wbFwR4LVhw5lf51WshPh1gxRDZSVkVMhQ46g4SxOIk8M1mA7s1AhAXo/O 0p9Suf5DyXMeze7wzv03e6VdKHlM8E6CLotFWye3KBcbe0DIwhRz/6iij4rTBfIDlVWe XxS1jpp0JRTTG/XYUK9MdX97+WnTqfh8y3H+c= 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=ET+CSKQxqjllrHu59h0vn/aj61cZ2KNVxA7OHOFNObg=; b=nm5UOp3Tde6eq78rxA2GHGoJuCRWqSBD6YRJMq9h5/ubHOdbDrPFRl8wz4U937dbmk +UrJgB/ZiqB6rIDi3CPdRVFes4kZgqZcqE6GCVWrGfwSJ4AS+U19jCqOl/vgt9hTdWm+ RiuviVa1N8DOpLAoVZMBfW2/LW1LDiO0+XcLiVu9w24hs+J3rIULbISwWWfGcvfaye5w eaKNtO10yPjOKWV68oaYfv95njq68g2BaFDXyCcKsSVVRTJfhjwtpEg3xyTKqTyWzOkE cURBD2kZNddxLghG11pjwsKb3sKF1lypl08zpWEUvCJi0d3NriFXa9jKo293UXROvMJp 6ELg== X-Gm-Message-State: APt69E1NLJJhij4eV3o/fXXbI9qBt/Q1OLwRabFB2Q5xpfyn9UUwLnUZ I6SKn1HXUr9Fj49EX4YEaau/vw== X-Received: by 2002:a1c:78b:: with SMTP id 133-v6mr13214645wmh.59.1529423519468; Tue, 19 Jun 2018 08:51:59 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id h4-v6sm1689wre.89.2018.06.19.08.51.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:56 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E9A2A3E08BB; Tue, 19 Jun 2018 16:44:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:29 +0100 Message-Id: <20180619154435.18898-51-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::242 Subject: [Qemu-devel] [PULL 50/56] docker: docker.py use "version" to probe usage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- v8 - use version instead of ps, add comment -- 2.17.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c83fd89985..e6685f6d81 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -49,7 +49,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: