diff mbox

[for-2.10,2/7] qemu-iotests: Remove blkdebug.conf after tests

Message ID 20170728131452.15316-3-kwolf@redhat.com
State New
Headers show

Commit Message

Kevin Wolf July 28, 2017, 1:14 p.m. UTC
qemu-iotests 074 and 179 left a blkdebug.conf behind the scratch
directory. Make sure to clean up after completing the tests.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 tests/qemu-iotests/074 | 1 +
 tests/qemu-iotests/179 | 1 +
 2 files changed, 2 insertions(+)

Comments

Jeff Cody July 28, 2017, 3:33 p.m. UTC | #1
On Fri, Jul 28, 2017 at 03:14:47PM +0200, Kevin Wolf wrote:
> qemu-iotests 074 and 179 left a blkdebug.conf behind the scratch
> directory. Make sure to clean up after completing the tests.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/074 | 1 +
>  tests/qemu-iotests/179 | 1 +
>  2 files changed, 2 insertions(+)
> 
> diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
> index aba126cb69..b17866bd34 100755
> --- a/tests/qemu-iotests/074
> +++ b/tests/qemu-iotests/074
> @@ -32,6 +32,7 @@ _cleanup()
>      echo "Cleanup"
>      _cleanup_test_img
>      rm "${TEST_IMG2}"
> +    rm -f "$TEST_DIR/blkdebug.conf"
>  }
>  trap "_cleanup; exit \$status" 0 1 2 3 15
>  
> diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179
> index 7bc8db8fe0..115944a753 100755
> --- a/tests/qemu-iotests/179
> +++ b/tests/qemu-iotests/179
> @@ -30,6 +30,7 @@ status=1	# failure is the default!
>  _cleanup()
>  {
>  	_cleanup_test_img
> +    rm -f "$TEST_DIR/blkdebug.conf"
>  }
>  trap "_cleanup; exit \$status" 0 1 2 3 15
>  
> -- 
> 2.13.3
> 
> 

Reviewed-by: Jeff Cody <jcody@redhat.com>
Eric Blake July 28, 2017, 7:27 p.m. UTC | #2
On 07/28/2017 08:14 AM, Kevin Wolf wrote:
> qemu-iotests 074 and 179 left a blkdebug.conf behind the scratch

s/behind/behind in/

> directory. Make sure to clean up after completing the tests.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
diff mbox

Patch

diff --git a/tests/qemu-iotests/074 b/tests/qemu-iotests/074
index aba126cb69..b17866bd34 100755
--- a/tests/qemu-iotests/074
+++ b/tests/qemu-iotests/074
@@ -32,6 +32,7 @@  _cleanup()
     echo "Cleanup"
     _cleanup_test_img
     rm "${TEST_IMG2}"
+    rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
diff --git a/tests/qemu-iotests/179 b/tests/qemu-iotests/179
index 7bc8db8fe0..115944a753 100755
--- a/tests/qemu-iotests/179
+++ b/tests/qemu-iotests/179
@@ -30,6 +30,7 @@  status=1	# failure is the default!
 _cleanup()
 {
 	_cleanup_test_img
+    rm -f "$TEST_DIR/blkdebug.conf"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15