From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
To: qemu-block@nongnu.org
Cc: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com,
vsementsov@virtuozzo.com, den@openvz.org, eblake@redhat.com,
jsnow@redhat.com
Subject: [PATCH v5 03/12] iotests: fix some whitespaces in test output files
Date: Thu, 22 Oct 2020 21:56:18 +0300 [thread overview]
Message-ID: <20201022185627.16987-4-vsementsov@virtuozzo.com> (raw)
In-Reply-To: <20201022185627.16987-1-vsementsov@virtuozzo.com>
We are going to be stricter about comparing test result with .out
files. So, fix some whitespaces now.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
tests/qemu-iotests/175.out | 2 +-
tests/qemu-iotests/271.out | 12 ++++++------
tests/qemu-iotests/287.out | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tests/qemu-iotests/175.out b/tests/qemu-iotests/175.out
index 39c2ee0f62..40a5bd1ce6 100644
--- a/tests/qemu-iotests/175.out
+++ b/tests/qemu-iotests/175.out
@@ -23,4 +23,4 @@ size=4096, min allocation
== resize empty image with block_resize ==
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=0
size=1048576, min allocation
- *** done
+*** done
diff --git a/tests/qemu-iotests/271.out b/tests/qemu-iotests/271.out
index 92deb7ebb0..81043ba4d7 100644
--- a/tests/qemu-iotests/271.out
+++ b/tests/qemu-iotests/271.out
@@ -500,7 +500,7 @@ L2 entry #0: 0x8000000000050001 0000000000000001
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
L2 entry #1: 0x8000000000060000 00000001ffffffff
-qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed
write failed: Input/output error
### Corrupted L2 entries - write test (unallocated) ###
@@ -515,14 +515,14 @@ L2 entry #0: 0x8000000000060000 0000000000000001
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
L2 entry #0: 0x0000000000000000 0000000000000001
-qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0); further corruption events will be suppressed
write failed: Input/output error
# Both 'subcluster is zero' and 'subcluster is allocated' bits set
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=1048576
L2 entry #1: 0x0000000000000000 0000000100000001
-qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed
+qcow2: Marking image as corrupt: Invalid cluster entry found (L2 offset: 0x40000, L2 index: 0x1); further corruption events will be suppressed
write failed: Input/output error
### Compressed cluster with subcluster bitmap != 0 - write test ###
@@ -583,7 +583,7 @@ read 524288/524288 bytes at offset 0
read 524288/524288 bytes at offset 524288
512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Offset Length Mapped to File
-0 0x80000 0 TEST_DIR/t.qcow2.base
+0 0x80000 0 TEST_DIR/t.qcow2.base
# backing file and preallocation=falloc
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=524288 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw preallocation=falloc
Image resized.
@@ -592,7 +592,7 @@ read 524288/524288 bytes at offset 0
read 524288/524288 bytes at offset 524288
512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Offset Length Mapped to File
-0 0x80000 0 TEST_DIR/t.qcow2.base
+0 0x80000 0 TEST_DIR/t.qcow2.base
# backing file and preallocation=full
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=524288 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=raw preallocation=full
Image resized.
@@ -601,7 +601,7 @@ read 524288/524288 bytes at offset 0
read 524288/524288 bytes at offset 524288
512 KiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
Offset Length Mapped to File
-0 0x80000 0 TEST_DIR/t.qcow2.base
+0 0x80000 0 TEST_DIR/t.qcow2.base
### Image resizing with preallocation and backing files ###
diff --git a/tests/qemu-iotests/287.out b/tests/qemu-iotests/287.out
index 6b9dfb4af0..49ab6a27d5 100644
--- a/tests/qemu-iotests/287.out
+++ b/tests/qemu-iotests/287.out
@@ -10,22 +10,22 @@ incompatible_features []
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
incompatible_features [3]
-=== Testing zlib with incompatible bit set ===
+=== Testing zlib with incompatible bit set ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
incompatible_features [3]
-=== Testing zstd with incompatible bit unset ===
+=== Testing zstd with incompatible bit unset ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
incompatible_features []
-=== Testing compression type values ===
+=== Testing compression type values ===
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- 0
+0
Formatting 'TEST_DIR/t.IMGFMT', fmt=IMGFMT size=67108864
- 1
+1
=== Testing simple reading and writing with zstd ===
--
2.21.3
next prev parent reply other threads:[~2020-10-22 19:08 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-22 18:56 [PATCH v5 00/12] Rework iotests/check Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 01/12] iotests/277: use dot slash for nbd-fault-injector.py running Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 02/12] iotests/303: use dot slash for qcow2.py running Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` Vladimir Sementsov-Ogievskiy [this message]
2020-10-22 18:56 ` [PATCH v5 04/12] iotests/283: make executable Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 05/12] iotests/299: " Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 06/12] iotests/294: add shebang line Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 07/12] iotests: define group in each iotest Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 08/12] iotests: add findtests.py Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 09/12] iotests: add testenv.py Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 10/12] iotests: add testrunner.py Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH v5 11/12] iotests: rewrite check into python Vladimir Sementsov-Ogievskiy
2020-10-22 18:56 ` [PATCH RFC v5 12/12] iotests: rename and move 169 and 199 tests Vladimir Sementsov-Ogievskiy
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=20201022185627.16987-4-vsementsov@virtuozzo.com \
--to=vsementsov@virtuozzo.com \
--cc=den@openvz.org \
--cc=eblake@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=mreitz@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).