From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, berto@igalia.com,
qemu-devel@nongnu.org, mreitz@redhat.com
Subject: [PATCH v4 8/9] iotests: Filter testfiles out in img_info_log()
Date: Mon, 20 Apr 2020 15:32:13 +0200 [thread overview]
Message-ID: <20200420133214.28921-9-kwolf@redhat.com> (raw)
In-Reply-To: <20200420133214.28921-1-kwolf@redhat.com>
This changes the output of some files where instead of filter_img_info()
now filter_testfiles() takes precedence, so update the reference output.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
tests/qemu-iotests/iotests.py | 5 ++++-
tests/qemu-iotests/206.out | 12 ++++++------
tests/qemu-iotests/242.out | 12 ++++++------
3 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py
index 7bc4934cd2..3eaf29411b 100644
--- a/tests/qemu-iotests/iotests.py
+++ b/tests/qemu-iotests/iotests.py
@@ -152,7 +152,10 @@ def img_info_log(filename, filter_path=None, imgopts=False, extra_args=[]):
output = qemu_img_pipe(*args)
if not filter_path:
filter_path = filename
- log(filter_img_info(output, filter_path))
+
+ output = filter_testfiles(output)
+ output = filter_img_info(output, filter_path)
+ log(output)
def qemu_io(*args):
'''Run qemu-io and return the stdout data'''
diff --git a/tests/qemu-iotests/206.out b/tests/qemu-iotests/206.out
index 61e7241e0b..adde82f9b8 100644
--- a/tests/qemu-iotests/206.out
+++ b/tests/qemu-iotests/206.out
@@ -12,7 +12,7 @@
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
{"return": {}}
-image: TEST_IMG
+image: TEST_DIR/PID-t.IMGFMT
file format: IMGFMT
virtual size: 128 MiB (134217728 bytes)
cluster_size: 65536
@@ -34,7 +34,7 @@ Format specific information:
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
{"return": {}}
-image: TEST_IMG
+image: TEST_DIR/PID-t.IMGFMT
file format: IMGFMT
virtual size: 64 MiB (67108864 bytes)
cluster_size: 65536
@@ -56,7 +56,7 @@ Format specific information:
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
{"return": {}}
-image: TEST_IMG
+image: TEST_DIR/PID-t.IMGFMT
file format: IMGFMT
virtual size: 32 MiB (33554432 bytes)
cluster_size: 2097152
@@ -78,11 +78,11 @@ Format specific information:
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
{"return": {}}
-image: TEST_IMG
+image: TEST_DIR/PID-t.IMGFMT
file format: IMGFMT
virtual size: 32 MiB (33554432 bytes)
cluster_size: 512
-backing file: TEST_IMG.base
+backing file: TEST_DIR/PID-t.IMGFMT.base
backing file format: IMGFMT
Format specific information:
compat: 0.10
@@ -95,7 +95,7 @@ Format specific information:
{"execute": "job-dismiss", "arguments": {"id": "job0"}}
{"return": {}}
-image: TEST_IMG
+image: TEST_DIR/PID-t.IMGFMT
file format: IMGFMT
virtual size: 32 MiB (33554432 bytes)
encrypted: yes
diff --git a/tests/qemu-iotests/242.out b/tests/qemu-iotests/242.out
index 7ac8404d11..0cc3a78bb2 100644
--- a/tests/qemu-iotests/242.out
+++ b/tests/qemu-iotests/242.out
@@ -6,7 +6,7 @@ wrote 262144/262144 bytes at offset 0
qemu-img info dump:
-image: TEST_IMG
+image: TEST_DIR/PID-disk
file format: IMGFMT
virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
@@ -26,7 +26,7 @@ wrote 262144/262144 bytes at offset 262144
qemu-img info dump:
-image: TEST_IMG
+image: TEST_DIR/PID-disk
file format: IMGFMT
virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
@@ -58,7 +58,7 @@ wrote 262144/262144 bytes at offset 524288
qemu-img info dump:
-image: TEST_IMG
+image: TEST_DIR/PID-disk
file format: IMGFMT
virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
@@ -98,7 +98,7 @@ Test 4
Checking "in-use" flag...
qemu-img info dump:
-image: TEST_IMG
+image: TEST_DIR/PID-disk
file format: IMGFMT
virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
@@ -143,11 +143,11 @@ Test 5
{"execute": "block-dirty-bitmap-add", "arguments": {"disabled": false, "granularity": 16384, "name": "bitmap-0", "node": "drive0", "persistent": true}}
{"return": {}}
Write an unknown bitmap flag '0x4' into a new QCOW2 image at offset 327695
-qemu-img: Could not open 'TEST_IMG': Bitmap 'bitmap-0' doesn't satisfy the constraints
+qemu-img: Could not open 'TEST_DIR/PID-disk': Bitmap 'bitmap-0' doesn't satisfy the constraints
Unset the unknown bitmap flag '0x4' in the bitmap directory entry:
-image: TEST_IMG
+image: TEST_DIR/PID-disk
file format: IMGFMT
virtual size: 1 MiB (1048576 bytes)
cluster_size: 65536
--
2.20.1
next prev parent reply other threads:[~2020-04-20 13:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-20 13:32 [PATCH v4 0/9] block: Fix resize (extending) of short overlays Kevin Wolf
2020-04-20 13:32 ` [PATCH v4 1/9] block: Add flags to BlockDriver.bdrv_co_truncate() Kevin Wolf
2020-04-20 13:57 ` Alberto Garcia
2020-04-21 8:15 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 2/9] block: Add flags to bdrv(_co)_truncate() Kevin Wolf
2020-04-20 13:58 ` Alberto Garcia
2020-04-21 8:25 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 3/9] block-backend: Add flags to blk_truncate() Kevin Wolf
2020-04-20 13:59 ` Alberto Garcia
2020-04-21 8:33 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 4/9] qcow2: Support BDRV_REQ_ZERO_WRITE for truncate Kevin Wolf
2020-04-20 14:02 ` Alberto Garcia
2020-04-21 8:47 ` Vladimir Sementsov-Ogievskiy
2020-04-21 10:50 ` Alberto Garcia
2020-04-21 11:19 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 5/9] raw-format: " Kevin Wolf
2020-04-20 14:03 ` Alberto Garcia
2020-04-20 15:14 ` Eric Blake
2020-04-20 15:32 ` Kevin Wolf
2020-04-20 15:53 ` Eric Blake
2020-04-20 13:32 ` [PATCH v4 6/9] file-posix: " Kevin Wolf
2020-04-20 14:05 ` Alberto Garcia
2020-04-21 10:56 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 7/9] block: truncate: Don't make backing file data visible Kevin Wolf
2020-04-20 14:10 ` Alberto Garcia
2020-04-21 11:19 ` Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` Kevin Wolf [this message]
2020-04-21 11:34 ` [PATCH v4 8/9] iotests: Filter testfiles out in img_info_log() Vladimir Sementsov-Ogievskiy
2020-04-20 13:32 ` [PATCH v4 9/9] iotests: Test committing to short backing file Kevin Wolf
2020-04-21 11:39 ` Vladimir Sementsov-Ogievskiy
2020-04-20 23:49 ` [PATCH v4 0/9] block: Fix resize (extending) of short overlays no-reply
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200420133214.28921-9-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=berto@igalia.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).