From 4c44b4a4c816a0450b80feb14d692c9c8b80fbd2 Mon Sep 17 00:00:00 2001 From: "Daniel P. Berrange" Date: Tue, 26 Jul 2016 17:16:07 +0100 Subject: iotest: fix python based IO tests The previous commit refactoring iotests.py: commit 66613974468fb6e1609fb3eabf55981b1ee436cf Author: Daniel P. Berrange Date: Wed Jul 20 14:23:10 2016 +0100 scripts: refactor the VM class in iotests for reuse was not properly tested and included a number of broken bits. - The 'event_match' method was not moved into qemu.py - The 'self._args' list parameter in QEMUMachine needs to be copied otherwise modifications will affect the global 'qemu_opts' variable in iotests.py - The QEMUQtestMachine class methods had inverted parameter order for the super() calls - The QEMUQtestMachine class forgot to add '-machine accel=qtest' - The QEMUQtestMachine class constructor needs to set a default 'name' value before using it as it may be None - The QEMUQtestMachine class constructor needs to use named parameters when calling the super constructor as it is leaving out some positional parameters. - The 'qemu_prog' variable should be a string not a list in iotests.py - The VM classs constructor needs to use named parameters when calling the super constructor as it is leaving out some positional parameters. - The path to the socket-scm-helper needs to be passed into the QEMUMachine class Signed-off-by: Daniel P. Berrange Message-id: 1469549767-27249-1-git-send-email-berrange@redhat.com Signed-off-by: Max Reitz --- scripts/qtest.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'scripts/qtest.py') diff --git a/scripts/qtest.py b/scripts/qtest.py index 03bc7f6..d5aecb5 100644 --- a/scripts/qtest.py +++ b/scripts/qtest.py @@ -79,25 +79,30 @@ class QEMUQtestProtocol(object): class QEMUQtestMachine(qemu.QEMUMachine): '''A QEMU VM''' - def __init__(self, binary, args=[], name=None, test_dir="/var/tmp"): - super(self, QEMUQtestMachine).__init__(binary, args, name, test_dir) + def __init__(self, binary, args=[], name=None, test_dir="/var/tmp", + socket_scm_helper=None): + if name is None: + name = "qemu-%d" % os.getpid() + super(QEMUQtestMachine, self).__init__(binary, args, name=name, test_dir=test_dir, + socket_scm_helper=socket_scm_helper) self._qtest_path = os.path.join(test_dir, name + "-qtest.sock") def _base_args(self): - args = super(self, QEMUQtestMachine)._base_args() - args.extend(['-qtest', 'unix:path=' + self._qtest_path]) + args = super(QEMUQtestMachine, self)._base_args() + args.extend(['-qtest', 'unix:path=' + self._qtest_path, + '-machine', 'accel=qtest']) return args def _pre_launch(self): - super(self, QEMUQtestMachine)._pre_launch() + super(QEMUQtestMachine, self)._pre_launch() self._qtest = QEMUQtestProtocol(self._qtest_path, server=True) def _post_launch(self): - super(self, QEMUQtestMachine)._post_launch() + super(QEMUQtestMachine, self)._post_launch() self._qtest.accept() def _post_shutdown(self): - super(self, QEMUQtestMachine)._post_shutdown() + super(QEMUQtestMachine, self)._post_shutdown() self._remove_if_exists(self._qtest_path) def qtest(self, cmd): -- cgit v1.1