diff options
| author | Max Reitz <mreitz@redhat.com> | 2020-02-24 18:16:31 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2020-03-24 11:57:38 +0100 |
| commit | 801ddbda7183e1e043015fd357ea5eb97d925fd2 (patch) | |
| tree | 26766125dfcab399c84f4ea343c0ae150315af69 /tests | |
| parent | 808cf3cb6af8171b4e24d24f2a2d461434dc6572 (diff) | |
iotests: Fix cleanup path in some tests
Some iotests leave behind some external data file when run for qcow2
with -o data_file. Fix that.
Signed-off-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200224171631.384314-1-mreitz@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/qemu-iotests/085 | 1 | ||||
| -rwxr-xr-x | tests/qemu-iotests/087 | 6 | ||||
| -rwxr-xr-x | tests/qemu-iotests/279 | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/tests/qemu-iotests/085 b/tests/qemu-iotests/085 index 46981dbb64..dd3c993a2d 100755 --- a/tests/qemu-iotests/085 +++ b/tests/qemu-iotests/085 @@ -39,6 +39,7 @@ SNAPSHOTS=10 _cleanup() { _cleanup_qemu + _cleanup_test_img for i in $(seq 1 ${SNAPSHOTS}) do _rm_test_img "${TEST_DIR}/${i}-${snapshot_virt0}" diff --git a/tests/qemu-iotests/087 b/tests/qemu-iotests/087 index d6c8613419..bdfdad3454 100755 --- a/tests/qemu-iotests/087 +++ b/tests/qemu-iotests/087 @@ -26,6 +26,12 @@ echo "QA output created by $seq" status=1 # failure is the default! +_cleanup() +{ + _cleanup_test_img +} +trap "_cleanup; exit \$status" 0 1 2 3 15 + # get standard environment, filters and checks . ./common.rc . ./common.filter diff --git a/tests/qemu-iotests/279 b/tests/qemu-iotests/279 index 30d29b1cb2..75a4747e6b 100755 --- a/tests/qemu-iotests/279 +++ b/tests/qemu-iotests/279 @@ -26,7 +26,7 @@ status=1 # failure is the default! _cleanup() { _cleanup_test_img - rm -f "$TEST_IMG.mid" + _rm_test_img "$TEST_IMG.mid" } trap "_cleanup; exit \$status" 0 1 2 3 15 |