[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v8 39/43] iotests: Let complete_and_wait() work with commit
From: |
Max Reitz |
Subject: |
[PATCH v8 39/43] iotests: Let complete_and_wait() work with commit |
Date: |
Tue, 1 Sep 2020 16:34:20 +0200 |
complete_and_wait() and wait_ready() currently only work for mirror
jobs. Let them work for active commit jobs, too.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Andrey Shinkevich <andrey.shinkevich@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/iotests.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index e197c73ca5..64ccaf9061 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -972,8 +972,12 @@ class QMPTestCase(unittest.TestCase):
def wait_ready(self, drive='drive0'):
"""Wait until a BLOCK_JOB_READY event, and return the event."""
- f = {'data': {'type': 'mirror', 'device': drive}}
- return self.vm.event_wait(name='BLOCK_JOB_READY', match=f)
+ return self.vm.events_wait([
+ ('BLOCK_JOB_READY',
+ {'data': {'type': 'mirror', 'device': drive}}),
+ ('BLOCK_JOB_READY',
+ {'data': {'type': 'commit', 'device': drive}})
+ ])
def wait_ready_and_cancel(self, drive='drive0'):
self.wait_ready(drive=drive)
@@ -992,7 +996,7 @@ class QMPTestCase(unittest.TestCase):
self.assert_qmp(result, 'return', {})
event = self.wait_until_completed(drive=drive, error=completion_error)
- self.assert_qmp(event, 'data/type', 'mirror')
+ self.assertTrue(event['data']['type'] in ['mirror', 'commit'])
def pause_wait(self, job_id='job0'):
with Timeout(3, "Timeout waiting for job to pause"):
--
2.26.2
- [PATCH v8 30/43] backup: Deal with filters, (continued)
- [PATCH v8 30/43] backup: Deal with filters, Max Reitz, 2020/09/01
- [PATCH v8 31/43] commit: Deal with filters, Max Reitz, 2020/09/01
- [PATCH v8 32/43] nbd: Use CAF when looking for dirty bitmap, Max Reitz, 2020/09/01
- [PATCH v8 33/43] qemu-img: Use child access functions, Max Reitz, 2020/09/01
- [PATCH v8 35/43] blockdev: Fix active commit choice, Max Reitz, 2020/09/01
- [PATCH v8 34/43] block: Drop backing_bs(), Max Reitz, 2020/09/01
- [PATCH v8 36/43] block: Inline bdrv_co_block_status_from_*(), Max Reitz, 2020/09/01
- [PATCH v8 38/43] iotests: Test that qcow2's data-file is flushed, Max Reitz, 2020/09/01
- [PATCH v8 37/43] block: Leave BDS.backing_{file,format} constant, Max Reitz, 2020/09/01
- [PATCH v8 39/43] iotests: Let complete_and_wait() work with commit,
Max Reitz <=
- [PATCH v8 40/43] iotests: Add filter commit test cases, Max Reitz, 2020/09/01
- [PATCH v8 41/43] iotests: Add filter mirror test cases, Max Reitz, 2020/09/01
- [PATCH v8 43/43] iotests: Test committing to overridden backing, Max Reitz, 2020/09/01
- [PATCH v8 42/43] iotests: Add test for commit in sub directory, Max Reitz, 2020/09/01
- Re: [PATCH v8 00/43] block: Deal with filters, Kevin Wolf, 2020/09/02