Sometimes we cannot tell which error message qemu will emit, and we do
not care. With this change, we can then just pass an array of all
possible messages to assert_qmp() and it will choose the right one.
Signed-off-by: Max Reitz
---
tests/qemu-iotests/iotests.py | 18 --
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index f811f69135..d96ba1f63c 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -596,9 +596,23 @@ class QMPTestCase(unittest.TestCase):
self.fail('path "%s" has value "%s"' % (path, str(result)))
def assert_qmp(self, d, path, value):
-'''Assert that the value for a specific path in a QMP dict matches'''
+'''Assert that the value for a specific path in a QMP dict
+ matches. When given a list of values, assert that any of
+ them matches.'''
+
result = self.dictpath(d, path)
-self.assertEqual(result, value, 'values not equal "%s" and "%s"' %
(str(result), str(value)))
+
+# [] makes no sense as a list of valid values, so treat it as
+# an actual single value.
+if isinstance(value, list) and value != []:
+for v in value:
+if result == v:
+return
+self.fail('no match for "%s" in %s' % (str(result), str(value)))
+else:
+self.assertEqual(result, value,
+ 'values not equal "%s" and "%s"'
+ % (str(result), str(value)))
def assert_no_active_block_jobs(self):
result = self.vm.qmp('query-block-jobs')
--
2.21.0
