From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 08/15] qemu-iotests/041: Fix leaked scratch images
Date: Tue, 1 Aug 2017 16:46:25 +0200 [thread overview]
Message-ID: <20170801144632.3831-9-kwolf@redhat.com> (raw)
In-Reply-To: <20170801144632.3831-1-kwolf@redhat.com>
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 | 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
next prev parent reply other threads:[~2017-08-01 14:47 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-08-01 14:46 [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 01/15] docs: add qemu-block-drivers(7) man page Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 02/15] iotests: Fix test 156 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 03/15] iotests: Redirect stderr to stdout in 186 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 04/15] iotests: Check dirty bitmap statistics in 124 Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 05/15] iotests: Add test of recent fix to 'qemu-img measure' Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 06/15] block: fix dangling bs->explicit_options in block.c Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 07/15] block: fix leaks in bdrv_open_driver() Kevin Wolf
2017-08-01 14:46 ` Kevin Wolf [this message]
2017-08-01 14:46 ` [Qemu-devel] [PULL 09/15] qemu-iotests: Remove blkdebug.conf after tests Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 10/15] qemu-iotests/141: Fix image cleanup Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 11/15] qemu-iotests/153: Fix leaked scratch images Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 12/15] qemu-iotests/162: Fix leaked temporary files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 13/15] qemu-iotests/063: Fix leaked image Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 14/15] qemu-iotests/059: Fix leaked image files Kevin Wolf
2017-08-01 14:46 ` [Qemu-devel] [PULL 15/15] block/qapi: Remove redundant NULL check to silence Coverity Kevin Wolf
2017-08-01 16:01 ` [Qemu-devel] [PULL 00/15] Block layer patches for 2.10.0-rc1 Peter Maydell
2017-08-01 16:10 ` Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170801144632.3831-9-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).