[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 03/30] tests/vm: pass args through to BaseVM's __init__
From: |
Alex Bennée |
Subject: |
[PATCH v3 03/30] tests/vm: pass args through to BaseVM's __init__ |
Date: |
Fri, 26 Jun 2020 19:13:30 +0100 |
From: Robert Foley <robert.foley@linaro.org>
Adding the args parameter to BaseVM's __init__.
We will shortly need to pass more parameters to the class
so let's just pass args rather than growing the parameter list.
Signed-off-by: Robert Foley <robert.foley@linaro.org>
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Message-Id: <20200601211421.1277-2-robert.foley@linaro.org>
---
tests/vm/basevm.py | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/tests/vm/basevm.py b/tests/vm/basevm.py
index a80b616a08d..5a58e6c3930 100644
--- a/tests/vm/basevm.py
+++ b/tests/vm/basevm.py
@@ -61,11 +61,10 @@ class BaseVM(object):
# 4 is arbitrary, but greater than 2,
# since we found we need to wait more than twice as long.
tcg_ssh_timeout_multiplier = 4
- def __init__(self, debug=False, vcpus=None, genisoimage=None,
- build_path=None):
+ def __init__(self, args):
self._guest = None
- self._genisoimage = genisoimage
- self._build_path = build_path
+ self._genisoimage = args.genisoimage
+ self._build_path = args.build_path
self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
suffix=".tmp",
dir="."))
@@ -78,7 +77,7 @@ class BaseVM(object):
self._ssh_pub_key_file = os.path.join(self._tmpdir, "id_rsa.pub")
open(self._ssh_pub_key_file, "w").write(SSH_PUB_KEY)
- self.debug = debug
+ self.debug = args.debug
self._stderr = sys.stderr
self._devnull = open(os.devnull, "w")
if self.debug:
@@ -92,8 +91,8 @@ class BaseVM(object):
(",ipv6=no" if not self.ipv6 else ""),
"-device", "virtio-net-pci,netdev=vnet",
"-vnc", "127.0.0.1:0,to=20"]
- if vcpus and vcpus > 1:
- self._args += ["-smp", "%d" % vcpus]
+ if args.jobs and args.jobs > 1:
+ self._args += ["-smp", "%d" % args.jobs]
if kvm_available(self.arch):
self._args += ["-enable-kvm"]
else:
@@ -456,8 +455,7 @@ def main(vmcls):
return 1
logging.basicConfig(level=(logging.DEBUG if args.debug
else logging.WARN))
- vm = vmcls(debug=args.debug, vcpus=args.jobs,
- genisoimage=args.genisoimage, build_path=args.build_path)
+ vm = vmcls(args)
if args.build_image:
if os.path.exists(args.image) and not args.force:
sys.stderr.writelines(["Image file exists: %s\n" % args.image,
--
2.20.1
- [PATCH v3 00/30] testing/next (gitlab, vm, docker), Alex Bennée, 2020/06/26
- [PATCH v3 01/30] iotests: Fix 051 output after qdev_init_nofail() removal, Alex Bennée, 2020/06/26
- [PATCH v3 02/30] crypto/linux_keyring: fix 'secret_keyring' configure test, Alex Bennée, 2020/06/26
- [PATCH v3 03/30] tests/vm: pass args through to BaseVM's __init__,
Alex Bennée <=
- [PATCH v3 04/30] tests/vm: Add configuration to basevm.py, Alex Bennée, 2020/06/26
- [PATCH v3 05/30] tests/vm: Added configuration file support, Alex Bennée, 2020/06/26
- [PATCH v3 07/30] tests/vm: Added a new script for ubuntu.aarch64., Alex Bennée, 2020/06/26
- [PATCH v3 06/30] tests/vm: Add common Ubuntu python module, Alex Bennée, 2020/06/26
- [PATCH v3 09/30] tests/vm: change scripts to use self._config, Alex Bennée, 2020/06/26
- [PATCH v3 18/30] gitlab: introduce explicit "container" and "build" stages, Alex Bennée, 2020/06/26
- [PATCH v3 12/30] tests/vm: switch from optsparse to argparse, Alex Bennée, 2020/06/26
- [PATCH v3 08/30] tests/vm: Added a new script for centos.aarch64., Alex Bennée, 2020/06/26
- [PATCH v3 10/30] python/qemu: Add ConsoleSocket for optional use in QEMUMachine, Alex Bennée, 2020/06/26