|
 |
357786 |
From 5914d4c0869766e245b5ed5ea857af72c3b0049e Mon Sep 17 00:00:00 2001
|
|
|
357786 |
From: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Date: Mon, 18 Jun 2018 16:43:12 +0200
|
|
|
357786 |
Subject: [PATCH 44/54] iotests: Let 216 make use of qemu-io's exit code
|
|
|
357786 |
|
|
|
357786 |
RH-Author: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Message-id: <20180618164312.24423-6-mreitz@redhat.com>
|
|
|
357786 |
Patchwork-id: 80776
|
|
|
357786 |
O-Subject: [RHV-7.6 qemu-kvm-rhev PATCH 5/5] iotests: Let 216 make use of qemu-io's exit code
|
|
|
357786 |
Bugzilla: 1519617
|
|
|
357786 |
RH-Acked-by: John Snow <jsnow@redhat.com>
|
|
|
357786 |
RH-Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
357786 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
As a showcase of how you can use qemu-io's exit code to determine
|
|
|
357786 |
success or failure (same for qemu-img), this test is changed to use
|
|
|
357786 |
qemu_io_silent() instead of qemu_io(), and to assert the exit code
|
|
|
357786 |
instead of logging the filtered result.
|
|
|
357786 |
|
|
|
357786 |
One real advantage of this is that in case of an error, you get a
|
|
|
357786 |
backtrace that helps you locate the issue in the test file quickly.
|
|
|
357786 |
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Reviewed-by: Eric Blake <eblake@redhat.com>
|
|
|
357786 |
Message-id: 20180509194302.21585-6-mreitz@redhat.com
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
(cherry picked from commit e4ca4e981a0a389d6af5dc5d8b5fbdd1a05276a0)
|
|
|
357786 |
Signed-off-by: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
357786 |
---
|
|
|
357786 |
tests/qemu-iotests/216 | 23 ++++++++++++-----------
|
|
|
357786 |
tests/qemu-iotests/216.out | 17 ++---------------
|
|
|
357786 |
2 files changed, 14 insertions(+), 26 deletions(-)
|
|
|
357786 |
|
|
|
357786 |
diff --git a/tests/qemu-iotests/216 b/tests/qemu-iotests/216
|
|
|
357786 |
index ca9b47a..3c0ae54 100755
|
|
|
357786 |
--- a/tests/qemu-iotests/216
|
|
|
357786 |
+++ b/tests/qemu-iotests/216
|
|
|
357786 |
@@ -20,7 +20,7 @@
|
|
|
357786 |
# Creator/Owner: Max Reitz <mreitz@redhat.com>
|
|
|
357786 |
|
|
|
357786 |
import iotests
|
|
|
357786 |
-from iotests import log, qemu_img_pipe, qemu_io, filter_qemu_io
|
|
|
357786 |
+from iotests import log, qemu_img, qemu_io_silent
|
|
|
357786 |
|
|
|
357786 |
# Need backing file support
|
|
|
357786 |
iotests.verify_image_format(supported_fmts=['qcow2', 'qcow', 'qed', 'vmdk'])
|
|
|
357786 |
@@ -50,14 +50,13 @@ with iotests.FilePath('base.img') as base_img_path, \
|
|
|
357786 |
log('--- Setting up images ---')
|
|
|
357786 |
log('')
|
|
|
357786 |
|
|
|
357786 |
- qemu_img_pipe('create', '-f', iotests.imgfmt, base_img_path, '64M')
|
|
|
357786 |
+ assert qemu_img('create', '-f', iotests.imgfmt, base_img_path, '64M') == 0
|
|
|
357786 |
+ assert qemu_io_silent(base_img_path, '-c', 'write -P 1 0M 1M') == 0
|
|
|
357786 |
+ assert qemu_img('create', '-f', iotests.imgfmt, '-b', base_img_path,
|
|
|
357786 |
+ top_img_path) == 0
|
|
|
357786 |
+ assert qemu_io_silent(top_img_path, '-c', 'write -P 2 1M 1M') == 0
|
|
|
357786 |
|
|
|
357786 |
- log(filter_qemu_io(qemu_io(base_img_path, '-c', 'write -P 1 0M 1M')))
|
|
|
357786 |
-
|
|
|
357786 |
- qemu_img_pipe('create', '-f', iotests.imgfmt, '-b', base_img_path,
|
|
|
357786 |
- top_img_path)
|
|
|
357786 |
-
|
|
|
357786 |
- log(filter_qemu_io(qemu_io(top_img_path, '-c', 'write -P 2 1M 1M')))
|
|
|
357786 |
+ log('Done')
|
|
|
357786 |
|
|
|
357786 |
log('')
|
|
|
357786 |
log('--- Doing COR ---')
|
|
|
357786 |
@@ -110,6 +109,8 @@ with iotests.FilePath('base.img') as base_img_path, \
|
|
|
357786 |
log('--- Checking COR result ---')
|
|
|
357786 |
log('')
|
|
|
357786 |
|
|
|
357786 |
- log(filter_qemu_io(qemu_io(base_img_path, '-c', 'discard 0 64M')))
|
|
|
357786 |
- log(filter_qemu_io(qemu_io(top_img_path, '-c', 'read -P 1 0M 1M')))
|
|
|
357786 |
- log(filter_qemu_io(qemu_io(top_img_path, '-c', 'read -P 2 1M 1M')))
|
|
|
357786 |
+ assert qemu_io_silent(base_img_path, '-c', 'discard 0 64M') == 0
|
|
|
357786 |
+ assert qemu_io_silent(top_img_path, '-c', 'read -P 1 0M 1M') == 0
|
|
|
357786 |
+ assert qemu_io_silent(top_img_path, '-c', 'read -P 2 1M 1M') == 0
|
|
|
357786 |
+
|
|
|
357786 |
+ log('Done')
|
|
|
357786 |
diff --git a/tests/qemu-iotests/216.out b/tests/qemu-iotests/216.out
|
|
|
357786 |
index d3fc590..45ea857 100644
|
|
|
357786 |
--- a/tests/qemu-iotests/216.out
|
|
|
357786 |
+++ b/tests/qemu-iotests/216.out
|
|
|
357786 |
@@ -3,12 +3,7 @@
|
|
|
357786 |
|
|
|
357786 |
--- Setting up images ---
|
|
|
357786 |
|
|
|
357786 |
-wrote 1048576/1048576 bytes at offset 0
|
|
|
357786 |
-1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
357786 |
-
|
|
|
357786 |
-wrote 1048576/1048576 bytes at offset 1048576
|
|
|
357786 |
-1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
357786 |
-
|
|
|
357786 |
+Done
|
|
|
357786 |
|
|
|
357786 |
--- Doing COR ---
|
|
|
357786 |
|
|
|
357786 |
@@ -17,12 +12,4 @@ wrote 1048576/1048576 bytes at offset 1048576
|
|
|
357786 |
|
|
|
357786 |
--- Checking COR result ---
|
|
|
357786 |
|
|
|
357786 |
-discard 67108864/67108864 bytes at offset 0
|
|
|
357786 |
-64 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
357786 |
-
|
|
|
357786 |
-read 1048576/1048576 bytes at offset 0
|
|
|
357786 |
-1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
357786 |
-
|
|
|
357786 |
-read 1048576/1048576 bytes at offset 1048576
|
|
|
357786 |
-1 MiB, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
|
|
|
357786 |
-
|
|
|
357786 |
+Done
|
|
|
357786 |
--
|
|
|
357786 |
1.8.3.1
|
|
|
357786 |
|