Commit b9247fc1 authored by Vladimir Sementsov-Ogievskiy's avatar Vladimir Sementsov-Ogievskiy Committed by John Snow
Browse files

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: default avatarVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
parent 9c98f145

tests/qemu-iotests/169

+9 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import time 
import itertools

import operator

import new

import re

from iotests import qemu_img
@@ -133,6 +134,14 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): 


        if should_migrate:

            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

            # to "cat" process left alive after test finish)

            self.vm_b = iotests.VM(path_suffix='b')