ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iotests: improve 169 

Before previous patch, iotest 169 was actually broken for the case
test_persistent__not_migbitmap__offline_shared, while formally
passing.

After migration log of vm_b had message:

    qemu-system-x86_64: Could not reopen qcow2 layer: Bitmap already
    exists: bitmap0

which means that invalidation failed and bs->drv = NULL.

It was because we've loaded bitmap twice: on open and on invalidation.

Add code to 169, to catch such fails.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2018-10-29 16:23:17 -04:00 committed by John Snow
parent 9c98f145df
commit b9247fc1a8
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/qemu-iotests/169
View File

@ -24,6 +24,7 @@ import time
import itertools import itertools
import operator import operator
import new import new
import re
from iotests import qemu_img from iotests import qemu_img
@ -133,6 +134,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
if should_migrate: if should_migrate:
self.vm_b.shutdown() self.vm_b.shutdown()
# catch 'Could not reopen qcow2 layer: Bitmap already exists'
# possible error
log = self.vm_b.get_log()
log = re.sub(r'^\[I \d+\.\d+\] OPENED\n', '', log)
log = re.sub(r'\[I \+\d+\.\d+\] CLOSED\n?$', '', log)
self.assertEqual(log, '')
# recreate vm_b, as we don't want -incoming option (this will lead # recreate vm_b, as we don't want -incoming option (this will lead
# to "cat" process left alive after test finish) # to "cat" process left alive after test finish)
self.vm_b = iotests.VM(path_suffix='b') self.vm_b = iotests.VM(path_suffix='b')