From: Kevin Wolf <kwolf@redhat.com>
Date: Mon, 16 Dec 2019 17:02:08 +0000 (+0100)
Subject: iotests: 207: Remove duplication with VM.blockdev_create()
X-Git-Tag: v5.0.0-rc0~171^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6055cdf3d9736ebb2971dc3e243fa5facdd415ee;p=thirdparty%2Fqemu.git

iotests: 207: Remove duplication with VM.blockdev_create()

The blockdev_create() function in this test case adds another filter to
the logging, but provides otherwise the same functionality as
VM.blockdev_create() from iotests.py. Make it a thin wrapper around the
iotests.py function.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/tests/qemu-iotests/207 b/tests/qemu-iotests/207
index ec8c1d06f00..812ab34e47b 100755
--- a/tests/qemu-iotests/207
+++ b/tests/qemu-iotests/207
@@ -35,13 +35,7 @@ def filter_hash(qmsg):
     return iotests.filter_qmp(qmsg, _filter)
 
 def blockdev_create(vm, options):
-    result = vm.qmp_log('blockdev-create', job_id='job0', options=options,
-                        filters=[iotests.filter_qmp_testfiles, filter_hash])
-
-    if 'return' in result:
-        assert result['return'] == {}
-        vm.run_job('job0')
-    iotests.log("")
+    vm.blockdev_create(options, filters=[iotests.filter_qmp_testfiles, filter_hash])
 
 with iotests.FilePath('t.img') as disk_path, \
      iotests.VM() as vm: