From patchwork Tue Sep 10 08:43:09 2019 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: 173451 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp5506863ilq; Tue, 10 Sep 2019 01:53:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqwW6FWUhWWG/Tb9Pe31afZf7MX7U/r+AHo/aGLv2XRVHwlV3ycWdQcA+mo4wMD/YvHDpB9z X-Received: by 2002:a05:6402:149a:: with SMTP id e26mr29365459edv.298.1568105614022; Tue, 10 Sep 2019 01:53:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568105614; cv=none; d=google.com; s=arc-20160816; b=UdL9Tm5xbrkJe60WGHAvZEpLl6QyKjjh+Z2wa5bCoyHhuRLsXxmZNsoC6nUubrv6Fe F1O9TDjoXMef2caYFiuWHgpjblCKm58EeODr4TCjCTMTxQ7QKWujEdm2Pu/mgRMumX46 imoAZaZFjOoa0WcLOkIqJAojJ3iqwUpFqwA1lXHS6FebSlDoBmYjBNm4DHgMvKcE2rHV Xsl7aioQRq69OsmpCWmupYL9KVMXVN1/hE1PO9TZaDmCZQpQvZtFPE4sxkbKmlbe7F/y VbddQA2A9j+VhVZYpKaxavqVMkWyWFNberrqR60+q1/bcOxalo+Ld8xTmsxQDQBiIz+W 84fQ== 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; bh=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=x3ACe4hVxgj2zw0SPIK7tns16JG652pV2o9onMnD7Mq6mFW36U6Q7u/ZsjvkAmVgLc r4r1LDXh0v0gJ6Gv4MCYEPPe7Mqwo7sC5v4qRdh8Mgd7EBkZYjFYX/IYxfuaSNdGL2WX 8MxB9IKZYRW3Z6TMkrOEaO8hyd7NRPXjEJoIGK4xGI3hVa00kvagyRbOJyjSgx2BSVKL SVcVJ8a1VlwLvfkrVarBGdtKEpKHb6fURbvT5v7VR0sXL96tafUCCcRtZ9lyL1zRFwfx xFGfW5Be+UuxccPLWJXXPmxbGAZVX+6nQzaHe/A2Z05A5xAfu4Jpcr35ykYJavKBy6uY dEvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OSQdQetj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id pv19si8806221ejb.181.2019.09.10.01.53.33 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 10 Sep 2019 01:53:34 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OSQdQetj; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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]:35834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bu0-0002s4-Ek for patch@linaro.org; Tue, 10 Sep 2019 04:53:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35785) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i7bkj-0003Ka-7M for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i7bki-0006II-4S for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:57 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:34251) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i7bkh-0006HO-UW for qemu-devel@nongnu.org; Tue, 10 Sep 2019 04:43:56 -0400 Received: by mail-wr1-x434.google.com with SMTP id a11so8601999wrx.1 for ; Tue, 10 Sep 2019 01:43:55 -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=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=OSQdQetjxPXfUYAoh6rJU+QZXwg65HfCX0FvaiGQX8tAJen+suNgxBvP4cVaeV8Rjo umPg2pg6mIZ0iKFW8xH8C3uNDsyGU8QMqAqcWkKChDdGLE04SMpTr7LVi8ngwZiaavvT xMHAo0zB1ZE/YD4CB6321H1wz/qKb2lfiMAxP3r7Aywkhb8dmHrPtYgj2MOBwqf26Fh1 gJCAcMc4tYHTz5Rjn85pD1wlaWfoCop9nSErBrfS6Cia7FAr9J5b5+jM5TnmCzI9Vyvq YsAQPvLSD0KQOfq8b8KMOtv/6QRyOtYBJvi1Yj3guf50Xo+05ZC0fJzoo13P7Y18G/LW FByQ== 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=ecFZo3SIq2Qf/hgLz+PBuSmYc5fnSAsalqfNQ/ik5mE=; b=iNYCGrB0U2GuE19B8dgNvenHzy78k6j0UKVFSY4zVcr3fupd1aLmRuuky4ACmn9Rfa u0wwq6Ak3Cz+AMB8jw39lkMUCT3IHHSqwcNArKbi4FxXZEVvmTr7z216L7y2Zb2+mhk0 IaIgJW/Z5jzpPjOf0Mr1TK1PzKK5tt5p6OXJUnDdizbeqHN9iaTp1wWObdaFtDDPHqxO gz6tHT0eJEOc0Vbf7y4/aeckvg7weIJTTRI5NCLyzoiYL/t+mo4s40fZonUrKRTn9AoL EFBypGv3/NmP+ROQWX6c6fJOQ2J8ugoIxve7ee8W04AzfDtc0W3zMrrldx+8EHH6LJmf L/HA== X-Gm-Message-State: APjAAAUjepykhE56PKyHys4h6dI7EeyR7ngW41bLeoczfhaHnQwTcDw9 UZJ7ZfyY9Y0koT/kLwFf31FXBw== X-Received: by 2002:adf:b612:: with SMTP id f18mr14163731wre.97.1568105034847; Tue, 10 Sep 2019 01:43:54 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id z1sm28989942wre.40.2019.09.10.01.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Sep 2019 01:43:53 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id DBAD31FF92; Tue, 10 Sep 2019 09:43:49 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 10 Sep 2019 09:43:09 +0100 Message-Id: <20190910084349.28817-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190910084349.28817-1-alex.bennee@linaro.org> References: <20190910084349.28817-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:4864:20::434 Subject: [Qemu-devel] [PULL 05/45] tests/docker: handle missing encoding keyword for subprocess.check_output X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This was only added in Python 3.6 and not all the build hosts have that recent a python3. However we still need to ensure everything is returns as a unicode string so checks higher up the call chain don't barf. Signed-off-by: Alex Bennée fixup! tests/docker: handle missing encoding keyword for subprocess.check_output -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index 1620293ac84..417b0cdce13 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -258,10 +258,16 @@ class Docker(object): return self._do_kill_instances(True) def _output(self, cmd, **kwargs): - return subprocess.check_output(self._command + cmd, - stderr=subprocess.STDOUT, - encoding='utf-8', - **kwargs) + if sys.version_info[1] >= 6: + return subprocess.check_output(self._command + cmd, + stderr=subprocess.STDOUT, + encoding='utf-8', + **kwargs) + else: + return subprocess.check_output(self._command + cmd, + stderr=subprocess.STDOUT, + **kwargs).decode('utf-8') + def inspect_tag(self, tag): try: