The previous commit refactoring iotests.py:
commit 66613974468fb6e1609fb3eabf55981b1ee436cf
Author: Daniel P. Berrange <berra...@redhat.com>
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.
Signed-off-by: Daniel P. Berrange <berra...@redhat.com>
---
scripts/qemu.py | 19 ++++++++++++++++++-
scripts/qtest.py | 15 +++++++++------
tests/qemu-iotests/iotests.py | 23 +++--------------------
3 files changed, 30 insertions(+), 27 deletions(-)
diff --git a/scripts/qemu.py b/scripts/qemu.py
index 9cdad24..4ba920c 100644
--- a/scripts/qemu.py
+++ b/scripts/qemu.py
@@ -33,7 +33,7 @@ class QEMUMachine(object):
self._qemu_log_path = os.path.join(test_dir, name + ".log")
self._popen = None
self._binary = binary
- self._args = args
+ self._args = list(args) # Force copy args in case we modify them
self._wrapper = wrapper
self._events = []
self._iolog = None
@@ -183,6 +183,23 @@ class QEMUMachine(object):
return events
def event_wait(self, name, timeout=60.0, match=None):
+ # Test if 'match' is a recursive subset of 'event'
+ def event_match(event, match=None):
+ if match is None:
+ return True
+
+ for key in match:
+ if key in event:
+ if isinstance(event[key], dict):
+ if not event_match(event[key], match[key]):
+ return False
+ elif event[key] != match[key]:
+ return False
+ else:
+ return False
+
+ return True
+
# Search cached events
for event in self._events:
if (event['event'] == name) and event_match(event, match):
diff --git a/scripts/qtest.py b/scripts/qtest.py
index 03bc7f6..d5c3b2c 100644
--- a/scripts/qtest.py
+++ b/scripts/qtest.py
@@ -80,24 +80,27 @@ 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)
+ if name is None:
+ name = "qemu-%d" % os.getpid()
+ super(QEMUQtestMachine, self).__init__(binary, args, name=name,
test_dir=test_dir)
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):
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 14427f4..bda3cdd 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -39,7 +39,7 @@ qemu_io_args = [os.environ.get('QEMU_IO_PROG', 'qemu-io')]
if os.environ.get('QEMU_IO_OPTIONS'):
qemu_io_args += os.environ['QEMU_IO_OPTIONS'].strip().split(' ')
-qemu_prog = [os.environ.get('QEMU_PROG', 'qemu')]
+qemu_prog = os.environ.get('QEMU_PROG', 'qemu')
qemu_opts = os.environ.get('QEMU_OPTIONS', '').strip().split(' ')
imgfmt = os.environ.get('IMGFMT', 'raw')
@@ -128,28 +128,11 @@ def log(msg, filters=[]):
msg = flt(msg)
print msg
-# Test if 'match' is a recursive subset of 'event'
-def event_match(event, match=None):
- if match is None:
- return True
-
- for key in match:
- if key in event:
- if isinstance(event[key], dict):
- if not event_match(event[key], match[key]):
- return False
- elif event[key] != match[key]:
- return False
- else:
- return False
-
- return True
-
-class VM(qtest.QEMUMachine):
+class VM(qtest.QEMUQtestMachine):
'''A QEMU VM'''
def __init__(self):
- super(self, VM).__init__(qemu_prog, qemu_opts, test_dir)
+ super(VM, self).__init__(qemu_prog, qemu_opts, test_dir=test_dir)
self._num_drives = 0
def add_drive_raw(self, opts):
--
2.7.4
