|
 |
7711c0 |
From 8e28b84e9502f95c2f08e20ec44b1f161193c2d8 Mon Sep 17 00:00:00 2001
|
|
|
7711c0 |
From: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Date: Wed, 20 Mar 2019 16:16:31 +0100
|
|
|
7711c0 |
Subject: [PATCH 033/163] iotests.py: Filter filename in any string value
|
|
|
7711c0 |
|
|
|
7711c0 |
RH-Author: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: <20190320161631.14841-20-jsnow@redhat.com>
|
|
|
7711c0 |
Patchwork-id: 84954
|
|
|
7711c0 |
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH 19/19] iotests.py: Filter filename in any string value
|
|
|
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 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
|
|
|
7711c0 |
filter_qmp_testfiles() currently filters the filename only for specific
|
|
|
7711c0 |
keys. However, there are more keys that take filenames (such as
|
|
|
7711c0 |
block-commit's @top and @base, or ssh's @path), and it does not make
|
|
|
7711c0 |
sense to list them all here. "$TEST_DIR/$PID-" should have enough
|
|
|
7711c0 |
entropy not to appear anywhere randomly.
|
|
|
7711c0 |
|
|
|
7711c0 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
Reviewed-by: John Snow <jsnow@redhat.com>
|
|
|
7711c0 |
Message-id: 20190210145736.1486-8-mreitz@redhat.com
|
|
|
7711c0 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
7711c0 |
(cherry picked from commit 56a6e5d0ca61f746577ea6223bcabbf7d6c576af)
|
|
|
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 | 2 +-
|
|
|
7711c0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
7711c0 |
|
|
|
7711c0 |
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
index 64bb718..a796ad2 100644
|
|
|
7711c0 |
--- a/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
+++ b/tests/qemu-iotests/iotests.py
|
|
|
7711c0 |
@@ -269,7 +269,7 @@ def filter_testfiles(msg):
|
|
|
7711c0 |
|
|
|
7711c0 |
def filter_qmp_testfiles(qmsg):
|
|
|
7711c0 |
def _filter(key, value):
|
|
|
7711c0 |
- if key == 'filename' or key == 'backing-file':
|
|
|
7711c0 |
+ if is_str(value):
|
|
|
7711c0 |
return filter_testfiles(value)
|
|
|
7711c0 |
return value
|
|
|
7711c0 |
return filter_qmp(qmsg, _filter)
|
|
|
7711c0 |
--
|
|
|
7711c0 |
1.8.3.1
|
|
|
7711c0 |
|