diff mbox

[for-2.10,5/7] qemu-iotests/162: Fix leaked temporary files

Message ID 20170728131452.15316-6-kwolf@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Kevin Wolf July 28, 2017, 1:14 p.m. UTC 
qemu-iotests 162 left qemu-nbd.pid behind in the scratch directory, and
potentially a file called '42' in the current directory. Make sure to
clean it up after completing the tests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/162 | 7 +++++++
 1 file changed, 7 insertions(+)

Comments

Jeff Cody July 28, 2017, 9:18 p.m. UTC | #1 
On Fri, Jul 28, 2017 at 03:14:50PM +0200, Kevin Wolf wrote:
> qemu-iotests 162 left qemu-nbd.pid behind in the scratch directory, and
> potentially a file called '42' in the current directory. Make sure to
> clean it up after completing the tests.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/162 | 7 +++++++
>  1 file changed, 7 insertions(+)
> 
> diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
> index cad2bd70ab..477a806360 100755
> --- a/tests/qemu-iotests/162
> +++ b/tests/qemu-iotests/162
> @@ -28,6 +28,13 @@ echo "QA output created by $seq"
>  here="$PWD"
>  status=1	# failure is the default!
>  
> +_cleanup()
> +{
> +    rm -f "${TEST_DIR}/qemu-nbd.pid"
> +    rm -f 42
> +}
> +trap "_cleanup; exit \$status" 0 1 2 3 15
> +
>  # get standard environment, filters and checks
>  . ./common.rc
>  . ./common.filter
> -- 
> 2.13.3
> 
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>
diff mbox

Patch

diff --git a/tests/qemu-iotests/162 b/tests/qemu-iotests/162
index cad2bd70ab..477a806360 100755
--- a/tests/qemu-iotests/162
+++ b/tests/qemu-iotests/162
@@ -28,6 +28,13 @@  echo "QA output created by $seq"
 here="$PWD"
 status=1	# failure is the default!
 
+_cleanup()
+{
+    rm -f "${TEST_DIR}/qemu-nbd.pid"
+    rm -f 42
+}
+trap "_cleanup; exit \$status" 0 1 2 3 15
+
 # get standard environment, filters and checks
 . ./common.rc
 . ./common.filter