OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

iotests.py: filter compression type out

Browse Source 
We want iotests pass with both the default zlib compression and with
IMGOPTS='compression_type=zstd'.

Actually the only test that is interested in real compression type in
test output is 287 (test for qcow2 compression type) and it's in bash.
So for now we can safely filter out compression type in all qcow2
tests.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Message-Id: <20211223160144.1097696-11-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-12-23 17:01:35 +01:00 committed by Hanna Reitz
parent a70eeb3d47
commit e877bba308
4 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/qemu-iotests/206.out
View File

@ -18,7 +18,7 @@ virtual size: 128 MiB (134217728 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -42,7 +42,7 @@ virtual size: 64 MiB (67108864 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -66,7 +66,7 @@ virtual size: 32 MiB (33554432 bytes)
cluster_size: 2097152 cluster_size: 2097152
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: true lazy refcounts: true
refcount bits: 1 refcount bits: 1
corrupt: false corrupt: false
@ -92,7 +92,7 @@ backing file: TEST_IMG.base
backing file format: IMGFMT backing file format: IMGFMT
Format specific information: Format specific information:
compat: 0.10 compat: 0.10
compression type: zlib compression type: COMPRESSION_TYPE
refcount bits: 16 refcount bits: 16
=== Successful image creation (encrypted) === === Successful image creation (encrypted) ===
@ -109,7 +109,7 @@ encrypted: yes
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
encrypt: encrypt:

10
tests/qemu-iotests/242.out
View File

@ -12,7 +12,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -34,7 +34,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
bitmaps: bitmaps:
[0]: [0]:
@ -68,7 +68,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
bitmaps: bitmaps:
[0]: [0]:
@ -110,7 +110,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
bitmaps: bitmaps:
[0]: [0]:
@ -161,7 +161,7 @@ virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
bitmaps: bitmaps:
[0]: [0]:

10
tests/qemu-iotests/274.out
View File

@ -50,7 +50,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT backing file format: IMGFMT
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -79,7 +79,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT backing file format: IMGFMT
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -114,7 +114,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT backing file format: IMGFMT
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -141,7 +141,7 @@ virtual size: 2 MiB (2097152 bytes)
cluster_size: 65536 cluster_size: 65536
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false
@ -176,7 +176,7 @@ backing file: TEST_DIR/PID-base
backing file format: IMGFMT backing file format: IMGFMT
Format specific information: Format specific information:
compat: 1.1 compat: 1.1
compression type: zlib compression type: COMPRESSION_TYPE
lazy refcounts: false lazy refcounts: false
refcount bits: 16 refcount bits: 16
corrupt: false corrupt: false

2
tests/qemu-iotests/iotests.py
View File

@ -497,6 +497,8 @@ def filter_img_info(output, filename):
'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX', 'uuid: XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX',
line) line)
line = re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line) line = re.sub('cid: [0-9]+', 'cid: XXXXXXXXXX', line)
line = re.sub('(compression type: )(zlib|zstd)', r'\1COMPRESSION_TYPE',
line)
lines.append(line) lines.append(line)
return '\n'.join(lines) return '\n'.join(lines)