aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>2019-01-24 15:25:25 +0300
committerKevin Wolf <kwolf@redhat.com>2019-05-20 17:08:56 +0200
commit832d78caa51e7ac3c17a37f2c0ed9d904e423a32 (patch)
treef919ed7778b626a8e417c3bb01a857ad2f0cca19
parent9183dd15334f1eee46051bbdafc6ab9fbfc2efd5 (diff)
downloadqemu-832d78caa51e7ac3c17a37f2c0ed9d904e423a32.zip
qemu-832d78caa51e7ac3c17a37f2c0ed9d904e423a32.tar.gz
qemu-832d78caa51e7ac3c17a37f2c0ed9d904e423a32.tar.bz2
iotest: fix 169: do not run qmp_cont in RUN_STATE_FINISH_MIGRATE
qmp_cont fails if vm in RUN_STATE_FINISH_MIGRATE, so let's wait for final RUN_STATE_POSTMIGRATE. Also, while being here, check qmp_cont result. Reported-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> Tested-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rwxr-xr-xtests/qemu-iotests/1697
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/qemu-iotests/169 b/tests/qemu-iotests/169
index 527aebd..7e06cc1 100755
--- a/tests/qemu-iotests/169
+++ b/tests/qemu-iotests/169
@@ -102,12 +102,17 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase):
event = self.vm_a.event_wait('MIGRATION')
if event['data']['status'] == 'completed':
break
+ while True:
+ result = self.vm_a.qmp('query-status')
+ if (result['return']['status'] == 'postmigrate'):
+ break
# test that bitmap is still here
removed = (not migrate_bitmaps) and persistent
self.check_bitmap(self.vm_a, False if removed else sha256)
- self.vm_a.qmp('cont')
+ result = self.vm_a.qmp('cont')
+ self.assert_qmp(result, 'return', {})
# test that bitmap is still here after invalidation
self.check_bitmap(self.vm_a, sha256)