[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3 |
Date: |
Fri, 7 Jun 2019 10:05:08 +0100 |
From: Wainer dos Santos Moschetta <address@hidden>
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 <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
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 = subprocess.check_output(["sha256sum", fname]).split()[0]
- return sha256sum == checksum
+ return sha256sum == checksum.decode()
cache_dir = os.path.expanduser("~/.cache/qemu-vm/download")
if not os.path.exists(cache_dir):
os.makedirs(cache_dir)
- fname = os.path.join(cache_dir, hashlib.sha1(url).hexdigest())
+ fname = os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdigest())
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
def add_source_dir(self, src_dir):
- name = "data-" + hashlib.sha1(src_dir).hexdigest()[:5]
+ name = "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5]
tarfile = 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):
def get_default_jobs():
if kvm_available(vmcls.arch):
- return multiprocessing.cpu_count() / 2
+ return multiprocessing.cpu_count() // 2
else:
return 1
--
2.20.1
- [Qemu-devel] [PULL 00/52] testing, gdbstub and cputlb fixes, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 04/52] tests/docker: Update the Fedora cross compile images to 30, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 05/52] tests/docker: Update the Ubuntu image to 19.04, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 09/52] tests/vm: Port basevm to Python 3,
Alex Bennée <=
- [Qemu-devel] [PULL 08/52] tests/vm: Use python configured on build, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 36/52] gdbstub: Implement continue (c pkt) with new infra, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 38/52] gdbstub: Implement set_thread (H pkt) with new infra, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 01/52] editorconfig: add setting for shell scripts, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 03/52] tests/docker: Update the Fedora image to Fedora 30, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 06/52] .travis.yml: bump gcc sanitiser job to gcc-9, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 02/52] qemu-io-cmds: use clock_gettime for benchmarking, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 07/52] .travis.yml: add clang ubsan job, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 10/52] tests/vm: Fix build-centos docker-based tests run, Alex Bennée, 2019/06/07
- [Qemu-devel] [PULL 11/52] tests/vm: Add missing variables on help, Alex Bennée, 2019/06/07