openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

iotests/129: Actually test a commit job 

Before this patch, test_block_commit() performs an active commit, which
under the hood is a mirror job.  If we want to test various different
block jobs, we should perhaps run an actual commit job instead.

Doing so requires adding an overlay above the source node before the
commit is done (and then specifying the source node as the top node for
the commit job).

Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Willian Rampazzo <willianr@redhat.com>
Message-Id: <20210118105720.14824-8-mreitz@redhat.com>
This commit is contained in:
Max Reitz 2021-01-18 11:57:17 +01:00
parent a1933dac8f
commit 55557b0245
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tests/qemu-iotests/129
View File

@ -27,6 +27,7 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
test_img = os.path.join(iotests.test_dir, 'test.img') test_img = os.path.join(iotests.test_dir, 'test.img')
target_img = os.path.join(iotests.test_dir, 'target.img') target_img = os.path.join(iotests.test_dir, 'target.img')
base_img = os.path.join(iotests.test_dir, 'base.img') base_img = os.path.join(iotests.test_dir, 'base.img')
overlay_img = os.path.join(iotests.test_dir, 'overlay.img')
def setUp(self): def setUp(self):
iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, "1G") iotests.qemu_img('create', '-f', iotests.imgfmt, self.base_img, "1G")
@ -37,6 +38,7 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
self.vm.add_object('throttle-group,id=tg0,x-bps-total=1024') self.vm.add_object('throttle-group,id=tg0,x-bps-total=1024')
source_drive = 'driver=throttle,' \ source_drive = 'driver=throttle,' \
'node-name=source,' \
'throttle-group=tg0,' \ 'throttle-group=tg0,' \
f'file.driver={iotests.imgfmt},' \ f'file.driver={iotests.imgfmt},' \
f'file.file.filename={self.test_img}' f'file.file.filename={self.test_img}'
@ -46,7 +48,8 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
def tearDown(self): def tearDown(self):
self.vm.shutdown() self.vm.shutdown()
for img in (self.test_img, self.target_img, self.base_img): for img in (self.test_img, self.target_img, self.base_img,
self.overlay_img):
iotests.try_remove(img) iotests.try_remove(img)
def do_test_stop(self, cmd, **args): def do_test_stop(self, cmd, **args):
@ -73,7 +76,27 @@ class TestStopWithBlockJob(iotests.QMPTestCase):
sync="full") sync="full")
def test_block_commit(self): def test_block_commit(self):
self.do_test_stop("block-commit", device="drive0") # Add overlay above the source node so that we actually use a
# commit job instead of a mirror job
iotests.qemu_img('create', '-f', iotests.imgfmt, self.overlay_img,
'1G')
result = self.vm.qmp('blockdev-add', **{
'node-name': 'overlay',
'driver': iotests.imgfmt,
'file': {
'driver': 'file',
'filename': self.overlay_img
}
})
self.assert_qmp(result, 'return', {})
result = self.vm.qmp('blockdev-snapshot',
node='source', overlay='overlay')
self.assert_qmp(result, 'return', {})
self.do_test_stop('block-commit', device='drive0', top_node='source')
if __name__ == '__main__': if __name__ == '__main__':
iotests.main(supported_fmts=["qcow2"], iotests.main(supported_fmts=["qcow2"],