[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/10] iotests: Fix 173
From: |
Eric Blake |
Subject: |
[PULL 07/10] iotests: Fix 173 |
Date: |
Mon, 18 Nov 2019 21:07:56 -0600 |
This test has been broken since 3.0. It used TEST_IMG to influence
the name of a file created during _make_test_img, but commit 655ae6bb
changed things so that the wrong file name is being created, which
then caused _launch_qemu to fail. In the meantime, the set of events
issued for the actions of the test has increased.
Why haven't we noticed the failure? Because the test rarely gets run:
'./check -qcow2 173' is insufficient (that defaults to using file protocol)
'./check -nfs 173' is insufficient (that defaults to using raw format)
so the test is only run with:
./check -qcow2 -nfs 173
Note that we already have a number of other problems with -nfs:
./check -nfs (fails 18/30)
./check -qcow2 -nfs (fails 45/76 after this patch, if exports does
not permit 'insecure')
and it's not on my priority list to fix those. Rather, I found this
because of my next patch's work on tests using _send_qemu_cmd.
Fixes: 655ae6b
Signed-off-by: Eric Blake <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
Message-Id: <address@hidden>
---
tests/qemu-iotests/173 | 4 ++--
tests/qemu-iotests/173.out | 6 +++++-
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/tests/qemu-iotests/173 b/tests/qemu-iotests/173
index 9e2fa2e73cb9..29dcaa1960df 100755
--- a/tests/qemu-iotests/173
+++ b/tests/qemu-iotests/173
@@ -47,9 +47,9 @@ size=100M
BASE_IMG="${TEST_DIR}/image.base"
TOP_IMG="${TEST_DIR}/image.snp1"
-TEST_IMG="${BASE_IMG}" _make_test_img $size
+TEST_IMG_FILE="${BASE_IMG}" _make_test_img $size
-TEST_IMG="${TOP_IMG}" _make_test_img $size
+TEST_IMG_FILE="${TOP_IMG}" _make_test_img $size
echo
echo === Running QEMU, using block-stream to find backing image ===
diff --git a/tests/qemu-iotests/173.out b/tests/qemu-iotests/173.out
index f477a0099a32..e83d17ec2f64 100644
--- a/tests/qemu-iotests/173.out
+++ b/tests/qemu-iotests/173.out
@@ -7,6 +7,10 @@ Formatting 'TEST_DIR/image.snp1', fmt=IMGFMT size=104857600
{"return": {}}
{"return": {}}
{"return": {}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "created", "id": "disk2"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "running", "id": "disk2"}}
{"return": {}}
-{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"BLOCK_JOB_COMPLETED", "data": {"device": "disk2", "len": 104857600, "offset":
104857600, "speed": 0, "type": "stream"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "waiting", "id": "disk2"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"JOB_STATUS_CHANGE", "data": {"status": "pending", "id": "disk2"}}
+{"timestamp": {"seconds": TIMESTAMP, "microseconds": TIMESTAMP}, "event":
"BLOCK_JOB_COMPLETED", "data": {"device": "disk2", "len": 0, "offset": 0,
"speed": 0, "type": "stream"}}
*** done
--
2.21.0
- [PULL 00/10] NBD patches for 2019-11-19 for 4.2-rc2, Eric Blake, 2019/11/18
- [PULL 01/10] iotests: Test NBD client reconnection, Eric Blake, 2019/11/18
- [PULL 04/10] bitmap: Enforce maximum bitmap name length, Eric Blake, 2019/11/18
- [PULL 06/10] MAINTAINERS: add more bitmap-related to Dirty Bitmaps section, Eric Blake, 2019/11/18
- [PULL 03/10] nbd/server: Prefer heap over stack for parsing client names, Eric Blake, 2019/11/18
- [PULL 02/10] qemu-coroutine-sleep: Silence Coverity warning, Eric Blake, 2019/11/18
- [PULL 05/10] nbd: Don't send oversize strings, Eric Blake, 2019/11/18
- [PULL 10/10] tests: More iotest 223 improvements, Eric Blake, 2019/11/18
- [PULL 08/10] iotests: Switch nbd tests to use Unix rather than TCP, Eric Blake, 2019/11/18
- [PULL 07/10] iotests: Fix 173,
Eric Blake <=
- [PULL 09/10] iotests: Include QMP input in .out files, Eric Blake, 2019/11/18
- Re: [PULL 00/10] NBD patches for 2019-11-19 for 4.2-rc2, Peter Maydell, 2019/11/19