[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 04/12] iotests/040: Don't check image pattern on zero-length i
From: |
John Snow |
Subject: |
[PATCH v3 04/12] iotests/040: Don't check image pattern on zero-length image |
Date: |
Mon, 18 Apr 2022 17:14:56 -0400 |
qemu-io fails on read/write beyond end-of-file on raw images, so skip
these invocations when running the zero-length image tests.
Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
---
tests/qemu-iotests/040 | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tests/qemu-iotests/040 b/tests/qemu-iotests/040
index adf5815781e..c4a90937dcb 100755
--- a/tests/qemu-iotests/040
+++ b/tests/qemu-iotests/040
@@ -86,8 +86,10 @@ class TestSingleDrive(ImageCommitTestCase):
qemu_img('create', '-f', iotests.imgfmt,
'-o', 'backing_file=%s' % mid_img,
'-F', iotests.imgfmt, test_img)
- qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)
- qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288',
mid_img)
+ if self.image_len:
+ qemu_io('-f', 'raw', '-c', 'write -P 0xab 0 524288', backing_img)
+ qemu_io('-f', iotests.imgfmt, '-c', 'write -P 0xef 524288 524288',
+ mid_img)
self.vm = iotests.VM().add_drive(test_img,
"node-name=top,backing.node-name=mid,backing.backing.node-name=base",
interface="none")
self.vm.add_device('virtio-scsi')
self.vm.add_device("scsi-hd,id=scsi0,drive=drive0")
@@ -101,11 +103,15 @@ class TestSingleDrive(ImageCommitTestCase):
def test_commit(self):
self.run_commit_test(mid_img, backing_img)
+ if not self.image_len:
+ return
qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)
qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)
def test_commit_node(self):
self.run_commit_test("mid", "base", node_names=True)
+ if not self.image_len:
+ return
qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)
qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)
@@ -192,11 +198,15 @@ class TestSingleDrive(ImageCommitTestCase):
def test_top_is_active(self):
self.run_commit_test(test_img, backing_img, need_ready=True)
+ if not self.image_len:
+ return
qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)
qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)
def test_top_is_default_active(self):
self.run_default_commit_test()
+ if not self.image_len:
+ return
qemu_io('-f', 'raw', '-c', 'read -P 0xab 0 524288', backing_img)
qemu_io('-f', 'raw', '-c', 'read -P 0xef 524288 524288', backing_img)
--
2.34.1
- [PATCH v3 00/12] iotests: add enhanced debugging info to qemu-io failures, John Snow, 2022/04/18
- [PATCH v3 01/12] iotests: replace calls to log(qemu_io(...)) with qemu_io_log(), John Snow, 2022/04/18
- [PATCH v3 09/12] iotests/image-fleecing: switch to qemu_io(), John Snow, 2022/04/18
- [PATCH v3 02/12] iotests/163: Fix broken qemu-io invocation, John Snow, 2022/04/18
- [PATCH v3 04/12] iotests/040: Don't check image pattern on zero-length image,
John Snow <=
- [PATCH v3 06/12] iotests: create generic qemu_tool() function, John Snow, 2022/04/18
- [PATCH v3 07/12] iotests: rebase qemu_io() on top of qemu_tool(), John Snow, 2022/04/18
- [PATCH v3 05/12] iotests/040: Fix TestCommitWithFilters test, John Snow, 2022/04/18
- [PATCH v3 11/12] iotests: remove qemu_io_silent() and qemu_io_silent_check()., John Snow, 2022/04/18
- [PATCH v3 03/12] iotests: Don't check qemu_io() output for specific error strings, John Snow, 2022/04/18
- [PATCH v3 10/12] iotests: remove qemu_io_pipe_and_status(), John Snow, 2022/04/18
- [PATCH v3 12/12] iotests: make qemu_io_log() check return codes by default, John Snow, 2022/04/18
- [PATCH v3 08/12] iotests/migration-permissions: use assertRaises() for qemu_io() negative test, John Snow, 2022/04/18
- Re: [PATCH v3 00/12] iotests: add enhanced debugging info to qemu-io failures, Hanna Reitz, 2022/04/25