[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 07/67] iotests.py: Filter data_file in filter_img_info
From: |
Max Reitz |
Subject: |
[PATCH 07/67] iotests.py: Filter data_file in filter_img_info |
Date: |
Tue, 1 Oct 2019 21:46:15 +0200 |
If $IMGOPTS contains a data_file reference, let filter_img_info filter
all data_file information.
Signed-off-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/iotests.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 280e6c2ec2..fb0a49372d 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -380,9 +380,13 @@ def filter_generated_node_ids(msg):
def filter_img_info(output, filename):
lines = []
+ user_data_file = any('data_file' in opt for opt in imgopts)
for line in output.split('\n'):
if 'disk size' in line or 'actual-size' in line:
continue
+ if user_data_file:
+ if 'data file' in line:
+ continue
line = line.replace(filename, 'TEST_IMG') \
.replace(imgfmt, 'IMGFMT')
line = re.sub('iters: [0-9]+', 'iters: XXX', line)
--
2.21.0
- Re: [PATCH 04/67] iotests.py: create_test_image, remove_test_image, (continued)
[PATCH 06/67] iotests.py: Add image_path(), Max Reitz, 2019/10/01
[PATCH 08/67] iotests.py: Add filter_json_filename(), Max Reitz, 2019/10/01
[PATCH 09/67] iotests.py: Add @hide_fields to img_info_log, Max Reitz, 2019/10/01
[PATCH 05/67] iotests.py: Add ImagePaths, Max Reitz, 2019/10/01
[PATCH 12/67] iotests/228: Filter json:{} filenames, Max Reitz, 2019/10/01
[PATCH 13/67] iotests/242: Hide refcount bit information, Max Reitz, 2019/10/01
[PATCH 07/67] iotests.py: Filter data_file in filter_img_info,
Max Reitz <=
[PATCH 11/67] iotests/224: Filter json:{} from commit command, Max Reitz, 2019/10/01
[PATCH 14/67] iotests: Use unsupported_imgopts in Python tests, Max Reitz, 2019/10/01
[PATCH 10/67] iotests/169: Skip persistent cases for compat=0.10, Max Reitz, 2019/10/01
[PATCH 15/67] iotests/030: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 18/67] iotests/044: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 16/67] iotests/040: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 17/67] iotests/041: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 19/67] iotests/045: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 21/67] iotests/056: Honor $IMGOPTS, Max Reitz, 2019/10/01
[PATCH 22/67] iotests/057: Honor $IMGOPTS, Max Reitz, 2019/10/01