|
|
7711c0 |
From 08890e6fc7100a01624ed80662d2a7d204e9f3b8 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 20 Mar 2019 16:16:19 +0100
|
|
|
7711c0 |
Subject: [PATCH 021/163] iotests: add filter_generated_node_ids
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190320161631.14841-8-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 84941
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 07/19] iotests: add filter_generated_node_ids
|
|
|
7711c0 |
Bugzilla: 1668956
|
|
|
7711c0 |
RH-Acked-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
7711c0 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
To mimic the common filter of the same name, but for the python tests.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
|
7711c0 |
Message-Id: <20181221093529.23855-7-jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Eric Blake <eblake@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit fa1151f811ffa1973b6980b09f095d0e2ebea08b)
|
|
|
7711c0 |
Signed-off-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
7711c0 |
---
|
|
|
7711c0 |
tests/qemu-iotests/iotests.py | 3 +++
|
|
|
7711c0 |
1 file changed, 3 insertions(+)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
index c5739a6..5334ff4 100644
|
|
|
7711c0 |
--- a/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
+++ b/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
@@ -233,6 +233,9 @@ def filter_testfiles(msg):
|
|
|
7711c0 |
prefix = os.path.join(test_dir, "%s-" % (os.getpid()))
|
|
|
7711c0 |
return msg.replace(prefix, 'TEST_DIR/PID-')
|
|
|
7711c0 |
|
|
|
7711c0 |
+def filter_generated_node_ids(msg):
|
|
|
7711c0 |
+ return re.sub("#block[0-9]+", "NODE_NAME", msg)
|
|
|
7711c0 |
+
|
|
|
7711c0 |
def filter_img_info(output, filename):
|
|
|
7711c0 |
lines = []
|
|
|
7711c0 |
for line in output.split('\n'):
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|