| Message ID | 20190520124716.30472-3-kraxel@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests/vm: serial console autoinstall, misc fixes. | expand |
On 5/20/19 2:47 PM, Gerd Hoffmann wrote: > 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> > --- > tests/vm/basevm.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py > index 0556bdcf9e9f..3126fb10a819 100755 > --- a/tests/vm/basevm.py > +++ b/tests/vm/basevm.py > @@ -73,7 +73,7 @@ class BaseVM(object): > "-vnc", "127.0.0.1:0,to=20", > "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")] > if vcpus and vcpus > 1: > - self._args += ["-smp", str(vcpus)] > + self._args += ["-smp", "%d" % vcpus] > if kvm_available(self.arch): > self._args += ["-enable-kvm"] > else: > @@ -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("utf-8") > > 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("utf-8")).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("utf-8")).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], > @@ -256,7 +256,7 @@ def main(vmcls): > vm.add_source_dir(args.build_qemu) > cmd = [vm.BUILD_SCRIPT.format( > configure_opts = " ".join(argv), > - jobs=args.jobs, > + jobs=int(args.jobs), > target=args.build_target, > verbose = "V=1" if args.verbose else "")] > else: > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py index 0556bdcf9e9f..3126fb10a819 100755 --- a/tests/vm/basevm.py +++ b/tests/vm/basevm.py @@ -73,7 +73,7 @@ class BaseVM(object): "-vnc", "127.0.0.1:0,to=20", "-serial", "file:%s" % os.path.join(self._tmpdir, "serial.out")] if vcpus and vcpus > 1: - self._args += ["-smp", str(vcpus)] + self._args += ["-smp", "%d" % vcpus] if kvm_available(self.arch): self._args += ["-enable-kvm"] else: @@ -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("utf-8") 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("utf-8")).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("utf-8")).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], @@ -256,7 +256,7 @@ def main(vmcls): vm.add_source_dir(args.build_qemu) cmd = [vm.BUILD_SCRIPT.format( configure_opts = " ".join(argv), - jobs=args.jobs, + jobs=int(args.jobs), target=args.build_target, verbose = "V=1" if args.verbose else "")] else:
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> --- tests/vm/basevm.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)