]> xenbits.xensource.com Git - qemu-xen.git/commitdiff
qemu-iotests/041: Fix leaked scratch images
authorKevin Wolf <kwolf@redhat.com>
Thu, 27 Jul 2017 13:13:20 +0000 (15:13 +0200)
committerKevin Wolf <kwolf@redhat.com>
Tue, 1 Aug 2017 16:09:33 +0000 (18:09 +0200)
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>
Reviewed-by: Jeff Cody <jcody@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
tests/qemu-iotests/041

index 4cda5407354fcb423eb300263d3cb2ca225bf134..a860a31e9a666556fcf71ed5fcb81c8506d6a1c3 100755 (executable)
@@ -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)