|
 |
ae23c9 |
From c491cc3ca87111382c337eda74a1d7cf74891df0 Mon Sep 17 00:00:00 2001
|
|
|
ae23c9 |
From: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Date: Tue, 26 Jun 2018 09:48:41 +0200
|
|
|
ae23c9 |
Subject: [PATCH 133/268] qemu-iotests: Add VM.get_qmp_events_filtered()
|
|
|
ae23c9 |
|
|
|
ae23c9 |
RH-Author: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Message-id: <20180626094856.6924-59-kwolf@redhat.com>
|
|
|
ae23c9 |
Patchwork-id: 81122
|
|
|
ae23c9 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH v2 58/73] qemu-iotests: Add VM.get_qmp_events_filtered()
|
|
|
ae23c9 |
Bugzilla: 1513543
|
|
|
ae23c9 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
ae23c9 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
ae23c9 |
|
|
|
ae23c9 |
This adds a helper function that returns a list of QMP events that are
|
|
|
ae23c9 |
already filtered through filter_qmp_event().
|
|
|
ae23c9 |
|
|
|
ae23c9 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Max Reitz <mreitz@redhat.com>
|
|
|
ae23c9 |
Reviewed-by: Jeff Cody <jcody@redhat.com>
|
|
|
ae23c9 |
(cherry picked from commit 5ad1dbf76a97b6f07d685585175832e990fe9a92)
|
|
|
ae23c9 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
ae23c9 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
ae23c9 |
---
|
|
|
ae23c9 |
tests/qemu-iotests/iotests.py | 5 +++++
|
|
|
ae23c9 |
1 file changed, 5 insertions(+)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
|
ae23c9 |
index d190ce7..8c08d05 100644
|
|
|
ae23c9 |
--- a/tests/qemu-iotests/iotests.py
|
|
|
ae23c9 |
+++ b/tests/qemu-iotests/iotests.py
|
|
|
ae23c9 |
@@ -393,6 +393,11 @@ class VM(qtest.QEMUQtestMachine):
|
|
|
ae23c9 |
output_list += [key + '=' + obj[key]]
|
|
|
ae23c9 |
return ','.join(output_list)
|
|
|
ae23c9 |
|
|
|
ae23c9 |
+ def get_qmp_events_filtered(self, wait=True):
|
|
|
ae23c9 |
+ result = []
|
|
|
ae23c9 |
+ for ev in self.get_qmp_events(wait=wait):
|
|
|
ae23c9 |
+ result.append(filter_qmp_event(ev))
|
|
|
ae23c9 |
+ return result
|
|
|
ae23c9 |
|
|
|
ae23c9 |
|
|
|
ae23c9 |
index_re = re.compile(r'([^\[]+)\[([^\]]+)\]')
|
|
|
ae23c9 |
--
|
|
|
ae23c9 |
1.8.3.1
|
|
|
ae23c9 |
|