[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 10/26] tests/vm: Port basevm to Python 3
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v1 10/26] tests/vm: Port basevm to Python 3 |
Date: |
Fri, 31 May 2019 08:22:57 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 |
On 5/30/19 12:15 PM, Alex Bennée wrote:
> 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>
> ---
> 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 0556bdcf9e9..083befce9f5 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
>
>
- Re: [Qemu-devel] [PATCH v1 02/26] qemu-io-cmds: use clock_gettime for benchmarking, (continued)
- [Qemu-devel] [PATCH v1 05/26] tests/docker: Update the Fedora cross compile images to 30, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 03/26] tests: Run the iotests during "make check" again, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 06/26] tests/docker: Update the Ubuntu image to 19.04, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 08/26] .travis.yml: add clang ubsan job, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 07/26] .travis.yml: bump gcc sanitiser job to gcc-9, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 10/26] tests/vm: Port basevm to Python 3, Alex Bennée, 2019/05/30
- Re: [Qemu-devel] [PATCH v1 10/26] tests/vm: Port basevm to Python 3,
Philippe Mathieu-Daudé <=
- [Qemu-devel] [PATCH v1 09/26] tests/vm: Use python configured on build, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 12/26] tests/vm: Add missing variables on help, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 13/26] scripts: use git archive in archive-source, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 11/26] tests/vm: Fix build-centos docker-based tests run, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 18/26] tests/vm: proper guest shutdown, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 25/26] tests/vm: fedora autoinstall, using serial console, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 16/26] tests/vm: use ssh with pty unconditionally, Alex Bennée, 2019/05/30
- [Qemu-devel] [PATCH v1 15/26] tests/vm: send proxy environment variables over ssh, Alex Bennée, 2019/05/30