diff options
| author | Eric Blake <eblake@redhat.com> | 2015-12-10 20:27:17 -0700 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2016-01-20 13:36:23 +0100 |
| commit | a174da3613f548d58433f64cf3c99dd302c6154a (patch) | |
| tree | bc082a8818350a285d140706e05788ba97d2300d /tests/qemu-iotests/028 | |
| parent | 25ad8e6e95770d4f01844dc2542d861e73b174b2 (diff) | |
qemu-iotests: Reduce racy output in 028
On my machine, './check -qcow2 028' was failing about 80% of the
time, due to a race in how many times the repeated attempts
to run 'info block-jobs' could occur before the job was done,
showing up as a failure of fewer '(qemu) ' prompts than in the
expected output. Silence the output during the repetitions, then
add a final clean command to keep the expected output useful;
once patched, I was finally able to run the test 20 times in a
row with no failures.
Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'tests/qemu-iotests/028')
| -rwxr-xr-x | tests/qemu-iotests/028 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tests/qemu-iotests/028 b/tests/qemu-iotests/028 index 009510d0d1..4909b9bc88 100755 --- a/tests/qemu-iotests/028 +++ b/tests/qemu-iotests/028 @@ -114,10 +114,12 @@ h=$QEMU_HANDLE QEMU_COMM_TIMEOUT=1 # Silence output since it contains the disk image path and QEMU's readline -# character echoing makes it very hard to filter the output +# 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" +qemu_cmd_repeat=20 _send_qemu_cmd $h "info block-jobs" "No active jobs" >/dev/null +_send_qemu_cmd $h "info block-jobs" "No active jobs" _send_qemu_cmd $h 'quit' "" # Base image sectors |