diff options
| author | Jeff Cody <jcody@redhat.com> | 2017-04-18 15:42:41 -0400 |
|---|---|---|
| committer | Jeff Cody <jcody@redhat.com> | 2017-04-24 15:09:33 -0400 |
| commit | ecfa185400ade2abc9915efa924cbad1e15a21a4 (patch) | |
| tree | 8b3a310b9af1ad90da5cbf7f815592490197a41b /tests/qemu-iotests/094 | |
| parent | 56e7cf8df03ae142c7797435dc0ece80a42f4fd0 (diff) | |
qemu-iotests: _cleanup_qemu must be called on exit
For the tests that use the common.qemu functions for running a QEMU
process, _cleanup_qemu must be called in the exit function.
If it is not, if the qemu process aborts, then not all of the droppings
are cleaned up (e.g. pidfile, fifos).
This updates those tests that did not have a cleanup in qemu-iotests.
(I swapped spaces for tabs in test 102 as well)
Reported-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jeff Cody <jcody@redhat.com>
Message-id: d59c2f6ad6c1da8b9b3c7f357c94a7122ccfc55a.1492544096.git.jcody@redhat.com
Diffstat (limited to 'tests/qemu-iotests/094')
| -rwxr-xr-x | tests/qemu-iotests/094 | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/tests/qemu-iotests/094 b/tests/qemu-iotests/094 index 0ba0b0c361..9aa01e3627 100755 --- a/tests/qemu-iotests/094 +++ b/tests/qemu-iotests/094 @@ -27,7 +27,14 @@ echo "QA output created by $seq" here="$PWD" status=1 # failure is the default! -trap "exit \$status" 0 1 2 3 15 +_cleanup() +{ + _cleanup_qemu + _cleanup_test_img + rm -f "$TEST_DIR/source.$IMGFMT" +} + +trap "_cleanup; exit \$status" 0 1 2 3 15 # get standard environment, filters and checks . ./common.rc @@ -73,8 +80,6 @@ _send_qemu_cmd $QEMU_HANDLE \ wait=1 _cleanup_qemu -_cleanup_test_img -rm -f "$TEST_DIR/source.$IMGFMT" # success, all done echo '*** done' |