Re: [PATCH v7 43/47] iotests: Let complete_and_wait() work with commit

[Andrey Shinkevich]

On 25.06.2020 18:22, Max Reitz wrote:

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 
---
  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 5ea4c4df8b..57b32d8ad3 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -932,8 +932,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)
@@ -952,7 +956,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"):



Reviewed-by: Andrey Shinkevich 

[PATCH v7 43/47] iotests: Let complete_and_wait() work with commit

[Max Reitz]

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 
---
 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 5ea4c4df8b..57b32d8ad3 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -932,8 +932,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)
@@ -952,7 +956,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