60 lines
2.2 KiB
Diff
60 lines
2.2 KiB
Diff
|
From 05fedde1374abb180cd2b51457385d8128aa7fe4 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Date: Fri, 7 Feb 2020 11:24:00 +0000
|
||
|
|
Subject: [PATCH 03/18] iotests: Create VM.blockdev_create()
|
||
|
|
|
||
|
|
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Message-id: <20200207112404.25198-3-kwolf@redhat.com>
|
||
|
|
Patchwork-id: 93748
|
||
|
|
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 2/6] iotests: Create VM.blockdev_create()
|
||
|
|
Bugzilla: 1781637
|
||
|
|
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
|
||
|
|
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
||
|
|
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
||
|
|
|
||
|
|
We have several almost identical copies of a blockdev_create() function
|
||
|
|
in different test cases. Time to create one unified function in
|
||
|
|
iotests.py.
|
||
|
|
|
||
|
|
To keep the diff managable, this patch only creates the function and
|
||
|
|
follow-up patches will convert the individual test cases.
|
||
|
|
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
(cherry picked from commit e9dbd1cae86f7cb6f8e470e1485aeb0c6e23ae64)
|
||
|
|
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
||
|
|
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
|
||
|
|
---
|
||
|
|
tests/qemu-iotests/iotests.py | 16 ++++++++++++++++
|
||
|
|
1 file changed, 16 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
||
|
|
index 3cff671..5741efb 100644
|
||
|
|
--- a/tests/qemu-iotests/iotests.py
|
||
|
|
+++ b/tests/qemu-iotests/iotests.py
|
||
|
|
@@ -638,6 +638,22 @@ class VM(qtest.QEMUQtestMachine):
|
||
|
|
elif status == 'null':
|
||
|
|
return error
|
||
|
|
|
||
|
|
+ # Returns None on success, and an error string on failure
|
||
|
|
+ def blockdev_create(self, options, job_id='job0', filters=None):
|
||
|
|
+ if filters is None:
|
||
|
|
+ filters = [filter_qmp_testfiles]
|
||
|
|
+ result = self.qmp_log('blockdev-create', filters=filters,
|
||
|
|
+ job_id=job_id, options=options)
|
||
|
|
+
|
||
|
|
+ if 'return' in result:
|
||
|
|
+ assert result['return'] == {}
|
||
|
|
+ job_result = self.run_job(job_id)
|
||
|
|
+ else:
|
||
|
|
+ job_result = result['error']
|
||
|
|
+
|
||
|
|
+ log("")
|
||
|
|
+ return job_result
|
||
|
|
+
|
||
|
|
def enable_migration_events(self, name):
|
||
|
|
log('Enabling migration QMP events on %s...' % name)
|
||
|
|
log(self.qmp('migrate-set-capabilities', capabilities=[
|
||
|
|
--
|
||
|
|
1.8.3.1
|
||
|
|
|