iotests/028: Fix for long $TEST_DIRs
PATCH v2 1/1 iotests/028: Fix for long $TEST_DIRs
For long test image paths, the order of the "Formatting" line and the "(qemu)" prompt after a drive_backup HMP command may be reversed. In fact, the interaction between the prompt and the line may lead to the "Formatting" to being greppable at all after "read"-ing it (if the prompt injects an IFS character into the "Formatting" string).
So just wait until we get a prompt. At that point, the block job must have been started, so "info block-jobs" will only return "No active jobs" once it is done.
---
v2:
- Fix another kind of race...
--- tests/qemu-iotests/028 | 11 ++++++++--- tests/qemu-iotests/028.out | 1 - 2 files changed, 8 insertions(+), 4 deletions(-)
tests/qemu-iotests/028 +8 -3
@@ -119,9 +119,14 @@ fi # Silence output since it contains the disk image path and QEMU's readline # character echoing makes it very hard to filter the output. Plus, there # is no telling how many times the command will repeat before succeeding. -_send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" >/dev/null -_send_qemu_cmd $h "" "Formatting" | _filter_img_create -qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" >/dev/null +# (Note that creating the image results in a "Formatting..." message over +# stdout, which is the same channel the monitor uses. We cannot reliably +# wait for it because the monitor output may interact with it in such a +# way that _timed_wait_for cannot read it. However, once the block job is +# done, we know that the "Formatting..." message must have appeared +# already, so the output is still deterministic.) +silent=y _send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" +silent=y qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h 'quit' ""
tests/qemu-iotests/028.out +0 -1
@@ -468,7 +468,6 @@ No errors were found on the image. block-backup -Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=IMGFMT size=4294968832 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT (qemu) info block-jobs No active jobs === IO: pattern 195
Signature · 1 line
2.21.0
Quoted 10 lines · Max Reitz
For long test image paths, the order of the "Formatting" line and the "(qemu)" prompt after a
drive_backupHMP command may be reversed. In fact, the interaction between the prompt and the line may lead to the "Formatting" to being greppable at all after "read"-ing it (if the prompt injects an IFS character into the "Formatting" string).So just wait until we get a prompt. At that point, the block job must have been started, so "info block-jobs" will only return "No active jobs" once it is done.
Quoted 5 lines
Reported-by Thomas Huth <[email protected]>Signed-off-by Max Reitz <[email protected]>---
v2:
- Fix another kind of race...
Thanks, that fixes the issue for me!
Quoted 48 lines · Max Reitz
For long test image paths, the order of the "Formatting" line and the "(qemu)" prompt after a
drive_backupHMP command may be reversed. In fact, the interaction between the prompt and the line may lead to the "Formatting" to being greppable at all after "read"-ing it (if the prompt injects an IFS character into the "Formatting" string).So just wait until we get a prompt. At that point, the block job must have been started, so "info block-jobs" will only return "No active jobs" once it is done.
Reported-by Thomas Huth <[email protected]>Signed-off-by Max Reitz <[email protected]>---
v2:
- Fix another kind of race...--- tests/qemu-iotests/028 | 11 ++++++++--- tests/qemu-iotests/028.out | 1 - 2 files changed, 8 insertions(+), 4 deletions(-)tests/qemu-iotests/028 +8
-3@@ -119,9 +119,14 @@ fi # Silence output since it contains the disk image path and QEMU's readline # character echoing makes it very hard to filter the output. Plus, there # is no telling how many times the command will repeat before succeeding. -_send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" >/dev/null -_send_qemu_cmd $h "" "Formatting" | _filter_img_create -qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" >/dev/null +# (Note that creating the image results in a "Formatting..." message over +# stdout, which is the same channel the monitor uses. We cannot reliably +# wait for it because the monitor output may interact with it in such a +# way that _timed_wait_for cannot read it. However, once the block job is +# done, we know that the "Formatting..." message must have appeared +# already, so the output is still deterministic.) +silent=y _send_qemu_cmd $h "drive_backup disk ${TEST_IMG}.copy" "(qemu)" +silent=y qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h 'quit' ""tests/qemu-iotests/028.out +0
-0
tests/qemu-iotests/028.out No errors were found on the image. · line 473
Quoted 7 lines
tests/qemu-iotests/028.out +0
-1@@ -468,7 +468,6 @@ No errors were found on the image. block-backup -Formatting 'TEST_DIR/t.IMGFMT.copy', fmt=IMGFMT size=4294968832 backing_file=TEST_DIR/t.IMGFMT.base backing_fmt=IMGFMT (qemu) info block-jobs No active jobs === IO: pattern 195
Kevin Wolf
AppliedAm 11.10.2019 um 14:18 hat Max Reitz geschrieben:
Quoted 6 lines
For long test image paths, the order of the "Formatting" line and the "(qemu)" prompt after a
drive_backupHMP command may be reversed. In fact, the interaction between the prompt and the line may lead to the "Formatting" to being greppable at all after "read"-ing it (if the prompt injects an IFS character into the "Formatting" string).
Quoted 6 lines
So just wait until we get a prompt. At that point, the block job must have been started, so "info block-jobs" will only return "No active jobs" once it is done.
Reported-by Thomas Huth <[email protected]>Signed-off-by Max Reitz <[email protected]>
Thanks, applied to the block branch.
Kevin