133 lines
5.2 KiB
Diff
133 lines
5.2 KiB
Diff
From 1f4ca318d904030aeaee0905b724335b3346acc3 Mon Sep 17 00:00:00 2001
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
|
Date: Tue, 26 Jun 2018 09:48:35 +0200
|
|
Subject: [PATCH 127/268] iotests: Move qmp_to_opts() to VM
|
|
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
Message-id: <20180626094856.6924-53-kwolf@redhat.com>
|
|
Patchwork-id: 81085
|
|
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 52/73] iotests: Move qmp_to_opts() to VM
|
|
Bugzilla: 1513543
|
|
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
|
qmp_to_opts() used to be a method of QMPTestCase, but recently we
|
|
started to add more Python test cases that don't make use of
|
|
QMPTestCase. In order to make the method usable there, move it to VM.
|
|
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
(cherry picked from commit 62a9428812c0f4aacbf2f7fdf449fa4f4ab3775c)
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
---
|
|
tests/qemu-iotests/041 | 6 +++---
|
|
tests/qemu-iotests/155 | 2 +-
|
|
tests/qemu-iotests/iotests.py | 45 ++++++++++++++++++++++---------------------
|
|
3 files changed, 27 insertions(+), 26 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
|
|
index e945879..c20ac7d 100755
|
|
--- a/tests/qemu-iotests/041
|
|
+++ b/tests/qemu-iotests/041
|
|
@@ -1030,9 +1030,9 @@ class TestOrphanedSource(iotests.QMPTestCase):
|
|
'read-only': 'on' }
|
|
|
|
self.vm = iotests.VM()
|
|
- self.vm.add_blockdev(self.qmp_to_opts(blk0))
|
|
- self.vm.add_blockdev(self.qmp_to_opts(blk1))
|
|
- self.vm.add_blockdev(self.qmp_to_opts(blk2))
|
|
+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk0))
|
|
+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk1))
|
|
+ self.vm.add_blockdev(self.vm.qmp_to_opts(blk2))
|
|
self.vm.launch()
|
|
|
|
def tearDown(self):
|
|
diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155
|
|
index 42dae04..63a5b5e 100755
|
|
--- a/tests/qemu-iotests/155
|
|
+++ b/tests/qemu-iotests/155
|
|
@@ -63,7 +63,7 @@ class BaseClass(iotests.QMPTestCase):
|
|
'driver': iotests.imgfmt,
|
|
'file': {'driver': 'file',
|
|
'filename': source_img}}
|
|
- self.vm.add_blockdev(self.qmp_to_opts(blockdev))
|
|
+ self.vm.add_blockdev(self.vm.qmp_to_opts(blockdev))
|
|
self.vm.add_device('virtio-blk,id=qdev0,drive=source')
|
|
self.vm.launch()
|
|
|
|
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
index 824f87d..d190ce7 100644
|
|
--- a/tests/qemu-iotests/iotests.py
|
|
+++ b/tests/qemu-iotests/iotests.py
|
|
@@ -373,6 +373,27 @@ class VM(qtest.QEMUQtestMachine):
|
|
return self.qmp('human-monitor-command',
|
|
command_line='qemu-io %s "%s"' % (drive, cmd))
|
|
|
|
+ def flatten_qmp_object(self, obj, output=None, basestr=''):
|
|
+ if output is None:
|
|
+ output = dict()
|
|
+ if isinstance(obj, list):
|
|
+ for i in range(len(obj)):
|
|
+ self.flatten_qmp_object(obj[i], output, basestr + str(i) + '.')
|
|
+ elif isinstance(obj, dict):
|
|
+ for key in obj:
|
|
+ self.flatten_qmp_object(obj[key], output, basestr + key + '.')
|
|
+ else:
|
|
+ output[basestr[:-1]] = obj # Strip trailing '.'
|
|
+ return output
|
|
+
|
|
+ def qmp_to_opts(self, obj):
|
|
+ obj = self.flatten_qmp_object(obj)
|
|
+ output_list = list()
|
|
+ for key in obj:
|
|
+ output_list += [key + '=' + obj[key]]
|
|
+ return ','.join(output_list)
|
|
+
|
|
+
|
|
|
|
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
|
|
|
|
@@ -400,26 +421,6 @@ class QMPTestCase(unittest.TestCase):
|
|
self.fail('invalid index "%s" in path "%s" in "%s"' % (idx, path, str(d)))
|
|
return d
|
|
|
|
- def flatten_qmp_object(self, obj, output=None, basestr=''):
|
|
- if output is None:
|
|
- output = dict()
|
|
- if isinstance(obj, list):
|
|
- for i in range(len(obj)):
|
|
- self.flatten_qmp_object(obj[i], output, basestr + str(i) + '.')
|
|
- elif isinstance(obj, dict):
|
|
- for key in obj:
|
|
- self.flatten_qmp_object(obj[key], output, basestr + key + '.')
|
|
- else:
|
|
- output[basestr[:-1]] = obj # Strip trailing '.'
|
|
- return output
|
|
-
|
|
- def qmp_to_opts(self, obj):
|
|
- obj = self.flatten_qmp_object(obj)
|
|
- output_list = list()
|
|
- for key in obj:
|
|
- output_list += [key + '=' + obj[key]]
|
|
- return ','.join(output_list)
|
|
-
|
|
def assert_qmp_absent(self, d, path):
|
|
try:
|
|
result = self.dictpath(d, path)
|
|
@@ -454,8 +455,8 @@ class QMPTestCase(unittest.TestCase):
|
|
'''Asserts that the given filename is a json: filename and that its
|
|
content is equal to the given reference object'''
|
|
self.assertEqual(json_filename[:5], 'json:')
|
|
- self.assertEqual(self.flatten_qmp_object(json.loads(json_filename[5:])),
|
|
- self.flatten_qmp_object(reference))
|
|
+ self.assertEqual(self.vm.flatten_qmp_object(json.loads(json_filename[5:])),
|
|
+ self.vm.flatten_qmp_object(reference))
|
|
|
|
def cancel_and_wait(self, drive='drive0', force=False, resume=False):
|
|
'''Cancel a block job and wait for it to finish, returning the event'''
|
|
--
|
|
1.8.3.1
|
|
|