5435e8a804
Backport patches related with iotest from upstream * Patches added: block-backend-Retain-permissions-after-m.patch iotest-065-explicit-compression-type.patch iotest-214-explicit-compression-type.patch iotest-302-use-img_info_log-helper.patch iotest-303-explicit-compression-type.patch iotest-39-use-_qcow2_dump_header.patch iotests-60-more-accurate-set-dirty-bit-i.patch iotests-bash-tests-filter-compression-ty.patch iotests-common.rc-introduce-_qcow2_dump_.patch iotests-declare-lack-of-support-for-comp.patch iotests-drop-qemu_img_verbose-helper.patch iotests-massive-use-_qcow2_dump_header.patch iotests-MRCE-Write-data-to-source.patch iotests.py-filter-out-successful-output-.patch iotests.py-img_info_log-rename-imgopts-a.patch iotests.py-implement-unsupported_imgopts.patch iotests.py-qemu_img-create-support-IMGOP.patch iotests.py-rewrite-default-luks-support-.patch iotests-specify-some-unsupported_imgopts.patch qcow2-simple-case-support-for-downgradin.patch tests-qemu-iotests-Fix-051-for-binaries-.patch OBS-URL: https://build.opensuse.org/request/show/955876 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=690
113 lines
4.4 KiB
Diff
113 lines
4.4 KiB
Diff
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Date: Thu, 23 Dec 2021 17:01:30 +0100
|
|
Subject: iotests: drop qemu_img_verbose() helper
|
|
|
|
Git-commit: 8f9e54ccfd047cbef09fe10fa75d59333052fb78
|
|
|
|
qemu_img_verbose() has a drawback of not going through generic
|
|
qemu_img_pipe_and_status(). qemu_img_verbose() is not very popular, so
|
|
update the only two users to qemu_img_log() and drop qemu_img_verbose()
|
|
at all.
|
|
|
|
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
|
|
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
|
|
Message-Id: <20211223160144.1097696-6-vsementsov@virtuozzo.com>
|
|
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
|
|
Signed-off-by: Li Zhang <lizhang@suse.de>
|
|
---
|
|
tests/qemu-iotests/044 | 5 +++--
|
|
tests/qemu-iotests/044.out | 1 +
|
|
tests/qemu-iotests/209 | 7 ++++---
|
|
tests/qemu-iotests/209.out | 2 ++
|
|
tests/qemu-iotests/iotests.py | 8 --------
|
|
5 files changed, 10 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/tests/qemu-iotests/044 b/tests/qemu-iotests/044
|
|
index d696e6442ad5b595d16a61f5c0dd..a5ee9a7ded3bf1f734322db80689 100755
|
|
--- a/tests/qemu-iotests/044
|
|
+++ b/tests/qemu-iotests/044
|
|
@@ -24,7 +24,7 @@ import os
|
|
import qcow2
|
|
from qcow2 import QcowHeader
|
|
import iotests
|
|
-from iotests import qemu_img, qemu_img_verbose, qemu_io
|
|
+from iotests import qemu_img, qemu_img_log, qemu_io
|
|
import struct
|
|
import subprocess
|
|
import sys
|
|
@@ -112,10 +112,11 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):
|
|
|
|
def test_grow_refcount_table(self):
|
|
qemu_io('-c', 'write 3800M 1M', test_img)
|
|
- qemu_img_verbose('check' , test_img)
|
|
+ qemu_img_log('check' , test_img)
|
|
pass
|
|
|
|
if __name__ == '__main__':
|
|
+ iotests.activate_logging()
|
|
iotests.main(supported_fmts=['qcow2'],
|
|
supported_protocols=['file'],
|
|
unsupported_imgopts=['refcount_bits'])
|
|
diff --git a/tests/qemu-iotests/044.out b/tests/qemu-iotests/044.out
|
|
index 703cf3dee186906c6b7b0104f142..ff663b17d71f96d1d9ade8b45bdd 100644
|
|
--- a/tests/qemu-iotests/044.out
|
|
+++ b/tests/qemu-iotests/044.out
|
|
@@ -1,6 +1,7 @@
|
|
No errors were found on the image.
|
|
7292415/33554432 = 21.73% allocated, 0.00% fragmented, 0.00% compressed clusters
|
|
Image end offset: 4296217088
|
|
+
|
|
.
|
|
----------------------------------------------------------------------
|
|
Ran 1 tests
|
|
diff --git a/tests/qemu-iotests/209 b/tests/qemu-iotests/209
|
|
index ff7efea11bc69d64ed3ba41c586d..f6ad08ec42a7055634adfcd263d1 100755
|
|
--- a/tests/qemu-iotests/209
|
|
+++ b/tests/qemu-iotests/209
|
|
@@ -20,8 +20,8 @@
|
|
#
|
|
|
|
import iotests
|
|
-from iotests import qemu_img_create, qemu_io, qemu_img_verbose, qemu_nbd, \
|
|
- file_path
|
|
+from iotests import qemu_img_create, qemu_io, qemu_img_log, qemu_nbd, \
|
|
+ file_path, log
|
|
|
|
iotests.script_initialize(supported_fmts=['qcow2'])
|
|
|
|
@@ -33,4 +33,5 @@ qemu_img_create('-f', iotests.imgfmt, disk, '1M')
|
|
qemu_io('-f', iotests.imgfmt, '-c', 'write 0 512K', disk)
|
|
|
|
qemu_nbd('-k', nbd_sock, '-x', 'exp', '-f', iotests.imgfmt, disk)
|
|
-qemu_img_verbose('map', '-f', 'raw', '--output=json', nbd_uri)
|
|
+qemu_img_log('map', '-f', 'raw', '--output=json', nbd_uri)
|
|
+log('done.') # avoid new line at the end of output file
|
|
diff --git a/tests/qemu-iotests/209.out b/tests/qemu-iotests/209.out
|
|
index f27be3fa7b0bf619ae5ff0a308fb..515906ac7a1962b78ef3787a4a7c 100644
|
|
--- a/tests/qemu-iotests/209.out
|
|
+++ b/tests/qemu-iotests/209.out
|
|
@@ -1,2 +1,4 @@
|
|
[{ "start": 0, "length": 524288, "depth": 0, "present": true, "zero": false, "data": true, "offset": 0},
|
|
{ "start": 524288, "length": 524288, "depth": 0, "present": true, "zero": true, "data": false, "offset": 524288}]
|
|
+
|
|
+done.
|
|
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
|
|
index f0370b520651aa4ccc1cdb0cf28e..5a6bfcbb6adbb84d412e37966360 100644
|
|
--- a/tests/qemu-iotests/iotests.py
|
|
+++ b/tests/qemu-iotests/iotests.py
|
|
@@ -227,14 +227,6 @@ def qemu_img_measure(*args):
|
|
def qemu_img_check(*args):
|
|
return json.loads(qemu_img_pipe("check", "--output", "json", *args))
|
|
|
|
-def qemu_img_verbose(*args):
|
|
- '''Run qemu-img without suppressing its output and return the exit code'''
|
|
- exitcode = subprocess.call(qemu_img_args + list(args))
|
|
- if exitcode < 0:
|
|
- sys.stderr.write('qemu-img received signal %i: %s\n'
|
|
- % (-exitcode, ' '.join(qemu_img_args + list(args))))
|
|
- return exitcode
|
|
-
|
|
def qemu_img_pipe(*args: str) -> str:
|
|
'''Run qemu-img and return its output'''
|
|
return qemu_img_pipe_and_status(*args)[0]
|