From patchwork Wed Jul 22 06:28:59 2020 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: 246973 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp269704ilg; Tue, 21 Jul 2020 23:34:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyrvWWAb+28pGzbcH5IAH1msIoHOy0zKOpIGXH5dBkuCm2tpPCquG8vFYYIbcZKbpkWVyUq X-Received: by 2002:a25:df8e:: with SMTP id w136mr47587327ybg.140.1595399643653; Tue, 21 Jul 2020 23:34:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595399643; cv=none; d=google.com; s=arc-20160816; b=W0FNfbfXLXQuGBw9/75aFB3ozwdTHB1tIFx/fMxtTIV6zAMw14pOtVOjSSqM09bJrv vv8nGUhmzhgYDraYNukB8ZR1WuoWyVeW8gqSpTGV6kdu755LUax4r49UeSNS42PUq4c8 +yEu48rFg4Hztys3m3ZNCD15aUNg1CORG3nfw7o1FAMpYfsZ9kfyFfCt6nVdtVsphy2z rSOwZ4NgqJiwLkLUGDtVSt7BTefG+8xvFUe8GJege0VNP9bZuJ0vGcEjPxNDmJvZ0CxM UhzQuz9uzv/En8wJbDbSAffWaIjqsoQLjyx1/dkyES3+rowwHoSqjVBWLAnPbmWuHnc9 am9A== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=caUD+G+LhTTTzQNp/RF4n3co4hQhy/e2II5ZFYKAsiQzmLfKzoF4o3UNmeQi80LTt7 qAwXITy1gSbFrfjRlw/DPHO9dib5moMenpNCJsyndKXskTHyqrcWnC/V0JtqfhO5PLz1 DLMXQnQ5r/5s5FXJHxugnLQak1t4fVJjPSvCx+0vFr1h8sepUuJ56L02nvfwEdfJZF5y S0KH2zqi2wDSqllrtNfuv3sHo4H8BTlcGFduJW33gGczcatz2oqMg6mvr6KdKS4tsl3V 3zig8aFn1a6Rwub7BUko1kgS3MDR8rbHZpKs5otL6FQsn1SxjpbQoNEBXEF4JiZpHjQj HAZg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=elfPb4nn; 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 f90si5099063ybi.165.2020.07.21.23.34.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Jul 2020 23:34:03 -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=elfPb4nn; 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]:39536 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jy8KJ-0005Nh-0y for patch@linaro.org; Wed, 22 Jul 2020 02:34:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jy8Fl-0007Nh-5P for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:21 -0400 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:46839) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jy8Fj-0006vn-0Z for qemu-devel@nongnu.org; Wed, 22 Jul 2020 02:29:20 -0400 Received: by mail-wr1-x443.google.com with SMTP id r12so676969wrj.13 for ; Tue, 21 Jul 2020 23:29:18 -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=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=elfPb4nnrSUwiW/bV0pZBaHIpKnqzEM61rBwtZcLcn5JFU9z+74X8DiuvkjtrNxRz8 TJAJZcA7VH+B6ctLfzXk3LjR7ns8yNGlX7ly5hfRwJtVlccrm+ewd5p00GGSje5wZTq0 Zxd5mm6GwffgX7dTXJ42+NA8PVeL2cZLu8bXEaoq4AVwOkTdw8+TPmyAlc3TW4adO1q1 SyaloCWXZZ53SKMjWSZg8KlrIbdzvyS1CTuSSevg7/CmlBvudQIUq9eOZtLj2DQ6arKJ 1VRdL9VeodH5TG84ci7+dBbBLdnjyv0smj8m91mElhqQLw3PhVYREY6BpdsBR1/yFfGe twWg== 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=8L2vbKsuiM4fLbSGCq4fCZieZ/wNbRKZPh+JXVwckiw=; b=XuIOgIg+iRyan2QdMUWXgW9qYm5w1pCQi8nZWooFZdnn3BiRwTwUcbT10S3Ybo93hd lUixo5ik6Wi3g5dQxlVRHk6dSeHLh5mYiabrgwscYYNBw1VRfcRTwkepVRt9od20gfrx H76g1h/CB/t4P12SrM6Q1SXdJRU5I/fQDZS0FgScL1IAsh14kOqykrYZUEU7Xr8lHtX8 IXkpd0hMf+w9/mkb37FRerJbtCPQLQ4VhT+SIYSvSZipeEH1T0WaOl1SRPekxJgPgbi4 LhQ0IyN6aqrE+1Ehsr/N776wJAW513R3kyJRiB+HY9NtcqvHsDWEq4tRQbQjcIgZOotW gTgg== X-Gm-Message-State: AOAM531cpuDtJ2B/0FJgU/czX/XjoLaqOTm/fpdo8UAVrYIh/XXQAErj g5I7WSgDVIK2HDA29IF+EdNK8lHf3Hw= X-Received: by 2002:a5d:4687:: with SMTP id u7mr31382443wrq.357.1595399357669; Tue, 21 Jul 2020 23:29:17 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id r11sm5854388wmh.1.2020.07.21.23.29.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Jul 2020 23:29:11 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D04591FF98; Wed, 22 Jul 2020 07:29:03 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 09/12] tests/docker: fix update command due to python3 str/bytes distinction Date: Wed, 22 Jul 2020 07:28:59 +0100 Message-Id: <20200722062902.24509-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200722062902.24509-1-alex.bennee@linaro.org> References: <20200722062902.24509-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::443; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x443.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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@euphon.net, berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mat?= =?utf-8?q?hieu-Daud=C3=A9?= , cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Does this seem convoluted to you? It feels a little complicated to me. Signed-off-by: Alex Bennée --- tests/docker/docker.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) -- 2.20.1 diff --git a/tests/docker/docker.py b/tests/docker/docker.py index c9f20d8d093..356d7618f1a 100755 --- a/tests/docker/docker.py +++ b/tests/docker/docker.py @@ -24,7 +24,7 @@ import tempfile import re import signal from tarfile import TarFile, TarInfo -from io import StringIO +from io import StringIO, BytesIO from shutil import copy, rmtree from pwd import getpwuid from datetime import datetime, timedelta @@ -541,13 +541,14 @@ class UpdateCommand(SubCommand): # Create a Docker buildfile df = StringIO() - df.write("FROM %s\n" % args.tag) - df.write("ADD . /\n") - df.seek(0) + df.write(u"FROM %s\n" % args.tag) + df.write(u"ADD . /\n") + + df_bytes = BytesIO(bytes(df.getvalue(), "UTF-8")) df_tar = TarInfo(name="Dockerfile") - df_tar.size = len(df.buf) - tmp_tar.addfile(df_tar, fileobj=df) + df_tar.size = df_bytes.getbuffer().nbytes + tmp_tar.addfile(df_tar, fileobj=df_bytes) tmp_tar.close()