diff mbox

[for-2.10,1/7] qemu-iotests/041: Fix leaked scratch images

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

Commit Message

Kevin Wolf July 28, 2017, 1:14 p.m. UTC 
qemu-iotests 041 left quorum_snapshot.img and target.img behind in the
scratch directory. Make sure to clean up after completing the tests.

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

Comments

Eric Blake July 28, 2017, 7:28 p.m. UTC | #1 
On 07/28/2017 08:14 AM, Kevin Wolf wrote:
> qemu-iotests 041 left quorum_snapshot.img and target.img behind in the
> scratch directory. Make sure to clean up after completing the tests.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/041 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Reviewed-by: Eric Blake <eblake@redhat.com>
Jeff Cody July 28, 2017, 9:34 p.m. UTC | #2 
On Fri, Jul 28, 2017 at 03:14:46PM +0200, Kevin Wolf wrote:
> qemu-iotests 041 left quorum_snapshot.img and target.img behind in the
> scratch directory. Make sure to clean up after completing the tests.
> 
> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
> ---
>  tests/qemu-iotests/041 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
> index 4cda540735..a860a31e9a 100755
> --- a/tests/qemu-iotests/041
> +++ b/tests/qemu-iotests/041
> @@ -418,6 +418,7 @@ new_state = "1"
>      def tearDown(self):
>          self.vm.shutdown()
>          os.remove(test_img)
> +        os.remove(target_img)
>          os.remove(backing_img)
>          os.remove(self.blkdebug_file)
>  
> @@ -568,6 +569,7 @@ new_state = "1"
>      def tearDown(self):
>          self.vm.shutdown()
>          os.remove(test_img)
> +        os.remove(target_img)
>          os.remove(backing_img)
>          os.remove(self.blkdebug_file)
>  
> @@ -821,7 +823,7 @@ class TestRepairQuorum(iotests.QMPTestCase):
>  
>      def tearDown(self):
>          self.vm.shutdown()
> -        for i in self.IMAGES + [ quorum_repair_img ]:
> +        for i in self.IMAGES + [ quorum_repair_img, quorum_snapshot_file ]:
>              # Do a try/except because the test may have deleted some images
>              try:
>                  os.remove(i)
> -- 
> 2.13.3
> 
> 

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

Patch

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 4cda540735..a860a31e9a 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -418,6 +418,7 @@  new_state = "1"
     def tearDown(self):
         self.vm.shutdown()
         os.remove(test_img)
+        os.remove(target_img)
         os.remove(backing_img)
         os.remove(self.blkdebug_file)
 
@@ -568,6 +569,7 @@  new_state = "1"
     def tearDown(self):
         self.vm.shutdown()
         os.remove(test_img)
+        os.remove(target_img)
         os.remove(backing_img)
         os.remove(self.blkdebug_file)
 
@@ -821,7 +823,7 @@  class TestRepairQuorum(iotests.QMPTestCase):
 
     def tearDown(self):
         self.vm.shutdown()
-        for i in self.IMAGES + [ quorum_repair_img ]:
+        for i in self.IMAGES + [ quorum_repair_img, quorum_snapshot_file ]:
             # Do a try/except because the test may have deleted some images
             try:
                 os.remove(i)