yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ddf19c
From 872fbd32d06bda4aba3a7e67a95f76f62e475dbe Mon Sep 17 00:00:00 2001
ddf19c
From: Kevin Wolf <kwolf@redhat.com>
ddf19c
Date: Fri, 13 Mar 2020 12:34:27 +0000
ddf19c
Subject: [PATCH 07/20] iotests: Use complete_and_wait() in 155
ddf19c
ddf19c
RH-Author: Kevin Wolf <kwolf@redhat.com>
ddf19c
Message-id: <20200313123439.10548-2-kwolf@redhat.com>
ddf19c
Patchwork-id: 94279
ddf19c
O-Subject: [RHEL-AV-8.2.0 qemu-kvm PATCH v2 01/13] iotests: Use complete_and_wait() in 155
ddf19c
Bugzilla: 1790482 1805143
ddf19c
RH-Acked-by: John Snow <jsnow@redhat.com>
ddf19c
RH-Acked-by: Daniel P. Berrange <berrange@redhat.com>
ddf19c
RH-Acked-by: Peter Krempa <pkrempa@redhat.com>
ddf19c
ddf19c
From: Max Reitz <mreitz@redhat.com>
ddf19c
ddf19c
This way, we get to see errors during the completion phase.
ddf19c
ddf19c
Signed-off-by: Max Reitz <mreitz@redhat.com>
ddf19c
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
ddf19c
Message-Id: <20200218103454.296704-14-mreitz@redhat.com>
ddf19c
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ddf19c
(cherry picked from commit 6644d0e6192b36cdf2902c9774e1afb8ab2e7223)
ddf19c
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
ddf19c
Signed-off-by: Danilo C. L. de Paula <ddepaula@redhat.com>
ddf19c
---
ddf19c
 tests/qemu-iotests/155 | 7 +------
ddf19c
 1 file changed, 1 insertion(+), 6 deletions(-)
ddf19c
ddf19c
diff --git a/tests/qemu-iotests/155 b/tests/qemu-iotests/155
ddf19c
index e194859..d7ef257 100755
ddf19c
--- a/tests/qemu-iotests/155
ddf19c
+++ b/tests/qemu-iotests/155
ddf19c
@@ -163,12 +163,7 @@ class MirrorBaseClass(BaseClass):
ddf19c
 
ddf19c
         self.assert_qmp(result, 'return', {})
ddf19c
 
ddf19c
-        self.vm.event_wait('BLOCK_JOB_READY')
ddf19c
-
ddf19c
-        result = self.vm.qmp('block-job-complete', device='mirror-job')
ddf19c
-        self.assert_qmp(result, 'return', {})
ddf19c
-
ddf19c
-        self.vm.event_wait('BLOCK_JOB_COMPLETED')
ddf19c
+        self.complete_and_wait('mirror-job')
ddf19c
 
ddf19c
     def testFull(self):
ddf19c
         self.runMirror('full')
ddf19c
-- 
ddf19c
1.8.3.1
ddf19c