From: Vladimir Sementsov-Ogievskiy Date: Sat, 16 Jan 2021 21:46:53 +0000 (+0300) Subject: iotests: 56: prepare for backup over block-copy X-Git-Tag: v6.0.0-rc0~125^2~17 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55f3e5cb3b187738b903ab72fe17472ab9354bd1;p=thirdparty%2Fqemu.git iotests: 56: prepare for backup over block-copy After introducing parallel async copy requests instead of plain cluster-by-cluster copying loop, we'll have to wait for paused status, as we need to wait for several parallel request. So, let's gently wait instead of just asserting that job already paused. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Max Reitz Message-Id: <20210116214705.822267-12-vsementsov@virtuozzo.com> Signed-off-by: Max Reitz --- diff --git a/tests/qemu-iotests/056 b/tests/qemu-iotests/056 index 0e6b8591e78..b459a3f1e88 100755 --- a/tests/qemu-iotests/056 +++ b/tests/qemu-iotests/056 @@ -308,8 +308,13 @@ class BackupTest(iotests.QMPTestCase): event = self.vm.event_wait(name="BLOCK_JOB_ERROR", match={'data': {'device': 'drive0'}}) self.assertNotEqual(event, None) - # OK, job should be wedged - res = self.vm.qmp('query-block-jobs') + # OK, job should pause, but it can't do it immediately, as it can't + # cancel other parallel requests (which didn't fail) + with iotests.Timeout(60, "Timeout waiting for backup actually paused"): + while True: + res = self.vm.qmp('query-block-jobs') + if res['return'][0]['status'] == 'paused': + break self.assert_qmp(res, 'return[0]/status', 'paused') res = self.vm.qmp('block-job-dismiss', id='drive0') self.assert_qmp(res, 'error/desc',