[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2] iotests/028: Fix for long $TEST_DIRs
From: |
John Snow |
Subject: |
Re: [PATCH v2] iotests/028: Fix for long $TEST_DIRs |
Date: |
Fri, 11 Oct 2019 20:14:20 -0400 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.1.0 |
On 10/11/19 8:18 AM, Max Reitz wrote:
> 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.
>
> Reported-by: Thomas Huth <address@hidden>
> Signed-off-by: Max Reitz <address@hidden>
> ---
> v2:
> - Fix another kind of race...
> ---
> tests/qemu-iotests/028 | 11 ++++++++---
> tests/qemu-iotests/028.out | 1 -
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028
> index 71301ec6e5..bba1ee59ae 100755
> --- a/tests/qemu-iotests/028
> +++ b/tests/qemu-iotests/028
> @@ -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' ""
>
> diff --git a/tests/qemu-iotests/028.out b/tests/qemu-iotests/028.out
> index 7d54aeb003..37aed84436 100644
> --- a/tests/qemu-iotests/028.out
> +++ b/tests/qemu-iotests/028.out
> @@ -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
>
Reviewed-by: John Snow <address@hidden>