tests/vm: python3 fixes
Add proper unicode handling when processing strings. Also need to explicitly say we want int not float. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190520124716.30472-3-kraxel@redhat.com> [AJB: fix conflicts with tests/vm: Port basevm to Python 3] Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
parent
8fc76176f6
commit
3ace9be6d2
|
@ -73,7 +73,7 @@ class BaseVM(object):
|
||||||
"-vnc", "127.0.0.1:0,to=20",
|
"-vnc", "127.0.0.1:0,to=20",
|
||||||
"-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")]
|
"-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")]
|
||||||
if vcpus and vcpus > 1:
|
if vcpus and vcpus > 1:
|
||||||
self._args += ["-smp", str(vcpus)]
|
self._args += ["-smp", "%d" % vcpus]
|
||||||
if kvm_available(self.arch):
|
if kvm_available(self.arch):
|
||||||
self._args += ["-enable-kvm"]
|
self._args += ["-enable-kvm"]
|
||||||
else:
|
else:
|
||||||
|
@ -85,12 +85,13 @@ class BaseVM(object):
|
||||||
if not sha256sum:
|
if not sha256sum:
|
||||||
return True
|
return True
|
||||||
checksum = subprocess.check_output(["sha256sum", fname]).split()[0]
|
checksum = subprocess.check_output(["sha256sum", fname]).split()[0]
|
||||||
return sha256sum == checksum.decode()
|
return sha256sum == checksum.decode("utf-8")
|
||||||
|
|
||||||
cache_dir = os.path.expanduser("~/.cache/qemu-vm/download")
|
cache_dir = os.path.expanduser("~/.cache/qemu-vm/download")
|
||||||
if not os.path.exists(cache_dir):
|
if not os.path.exists(cache_dir):
|
||||||
os.makedirs(cache_dir)
|
os.makedirs(cache_dir)
|
||||||
fname = os.path.join(cache_dir, hashlib.sha1(url.encode()).hexdigest())
|
fname = os.path.join(cache_dir,
|
||||||
|
hashlib.sha1(url.encode("utf-8")).hexdigest())
|
||||||
if os.path.exists(fname) and check_sha256sum(fname):
|
if os.path.exists(fname) and check_sha256sum(fname):
|
||||||
return fname
|
return fname
|
||||||
logging.debug("Downloading %s to %s...", url, fname)
|
logging.debug("Downloading %s to %s...", url, fname)
|
||||||
|
@ -134,7 +135,7 @@ class BaseVM(object):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
def add_source_dir(self, src_dir):
|
def add_source_dir(self, src_dir):
|
||||||
name = "data-" + hashlib.sha1(src_dir.encode()).hexdigest()[:5]
|
name = "data-" + hashlib.sha1(src_dir.encode("utf-8")).hexdigest()[:5]
|
||||||
tarfile = os.path.join(self._tmpdir, name + ".tar")
|
tarfile = os.path.join(self._tmpdir, name + ".tar")
|
||||||
logging.debug("Creating archive %s for src_dir dir: %s", tarfile, src_dir)
|
logging.debug("Creating archive %s for src_dir dir: %s", tarfile, src_dir)
|
||||||
subprocess.check_call(["./scripts/archive-source.sh", tarfile],
|
subprocess.check_call(["./scripts/archive-source.sh", tarfile],
|
||||||
|
@ -256,7 +257,7 @@ def main(vmcls):
|
||||||
vm.add_source_dir(args.build_qemu)
|
vm.add_source_dir(args.build_qemu)
|
||||||
cmd = [vm.BUILD_SCRIPT.format(
|
cmd = [vm.BUILD_SCRIPT.format(
|
||||||
configure_opts = " ".join(argv),
|
configure_opts = " ".join(argv),
|
||||||
jobs=args.jobs,
|
jobs=int(args.jobs),
|
||||||
target=args.build_target,
|
target=args.build_target,
|
||||||
verbose = "V=1" if args.verbose else "")]
|
verbose = "V=1" if args.verbose else "")]
|
||||||
else:
|
else:
|
||||||
|
|
Loading…
Reference in a new issue