From nobody Mon Feb 9 01:20:14 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1553909649693554.2898686334067; Fri, 29 Mar 2019 18:34:09 -0700 (PDT) Received: from localhost ([127.0.0.1]:42325 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA2sm-0008QW-Ad for importer@patchew.org; Fri, 29 Mar 2019 21:34:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:46381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hA12P-0000o4-3c for qemu-devel@nongnu.org; Fri, 29 Mar 2019 19:35:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h9yjx-0004jz-90 for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:52406) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h9yjx-0004Q4-0G for qemu-devel@nongnu.org; Fri, 29 Mar 2019 17:08:41 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 538C3309179A; Fri, 29 Mar 2019 21:08:10 +0000 (UTC) Received: from virtlab514.virt.lab.eng.bos.redhat.com (virtlab514.virt.lab.eng.bos.redhat.com [10.19.152.210]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7A48018247; Fri, 29 Mar 2019 21:08:09 +0000 (UTC) From: Wainer dos Santos Moschetta To: qemu-devel@nongnu.org Date: Fri, 29 Mar 2019 17:08:01 -0400 Message-Id: <20190329210804.22121-3-wainersm@redhat.com> In-Reply-To: <20190329210804.22121-1-wainersm@redhat.com> References: <20190329210804.22121-1-wainersm@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Fri, 29 Mar 2019 21:08:10 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/5] tests/vm: Port basevm to Python 3 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: fam@euphon.net, peter.maydell@linaro.org, philmd@redhat.com, lersek@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Fixed tests/vm/basevm.py to run with Python 3: - hashlib.sha1() requires an binary encoded object. - uses floor division ("//") (PEP 238). - decode bytes to unicode when needed. Signed-off-by: Wainer dos Santos Moschetta Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- tests/vm/basevm.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e..083befce9f 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -85,12 +85,12 @@ class BaseVM(object): if not sha256sum: return True checksum =3D subprocess.check_output(["sha256sum", fname]).spl= it()[0] - return sha256sum =3D=3D checksum + return sha256sum =3D=3D checksum.decode() =20 cache_dir =3D os.path.expanduser("~/.cache/qemu-vm/download") if not os.path.exists(cache_dir): os.makedirs(cache_dir) - fname =3D os.path.join(cache_dir, hashlib.sha1(url).hexdigest()) + fname =3D os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdi= gest()) if os.path.exists(fname) and check_sha256sum(fname): return fname logging.debug("Downloading %s to %s...", url, fname) @@ -134,7 +134,7 @@ class BaseVM(object): raise NotImplementedError =20 def add_source_dir(self, src_dir): - name =3D "data-" + hashlib.sha1(src_dir).hexdigest()[:5] + name =3D "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5] tarfile =3D os.path.join(self._tmpdir, name + ".tar") logging.debug("Creating archive %s for src_dir dir: %s", tarfile, = src_dir) subprocess.check_call(["./scripts/archive-source.sh", tarfile], @@ -204,7 +204,7 @@ def parse_args(vmcls): =20 def get_default_jobs(): if kvm_available(vmcls.arch): - return multiprocessing.cpu_count() / 2 + return multiprocessing.cpu_count() // 2 else: return 1 =20 --=20 2.18.1