qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 04/15] qemu-iotests: Fix cleanup for 192
Date: Fri, 10 May 2019 18:16:03 +0200	[thread overview]
Message-ID: <20190510161614.23236-5-kwolf@redhat.com> (raw)
In-Reply-To: <20190510161614.23236-1-kwolf@redhat.com>

Test case 192 calls _launch_qemu, so it also needs to _cleanup_qemu when
it's done, otherwise the QMP FIFOs stay around in scratch/. It also
creates a temporary NBD socket that needs to be removed as well at the
end of the test case.

Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Tested-by: Thomas Huth <thuth@redhat.com>
---
 tests/qemu-iotests/192 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/192 b/tests/qemu-iotests/192
index 158086f9d2..61a88ac88d 100755
--- a/tests/qemu-iotests/192
+++ b/tests/qemu-iotests/192
@@ -29,7 +29,9 @@ status=1	# failure is the default!
 
 _cleanup()
 {
-	_cleanup_test_img
+    _cleanup_qemu
+    _cleanup_test_img
+    rm -f "$TEST_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
-- 
2.20.1



  parent reply	other threads:[~2019-05-10 16:21 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-10 16:15 [Qemu-devel] [PULL 00/15] Block layer patches Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 01/15] block: remove bs from lists before closing Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 02/15] MAINTAINERS: Downgrade status of block sections without "M:" to "Odd Fixes" Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 03/15] MAINTAINERS: Add an entry for the Parallel NOR Flash devices Kevin Wolf
2019-05-10 16:16 ` Kevin Wolf [this message]
2019-05-10 16:16 ` [Qemu-devel] [PULL 05/15] blockjob: Fix coroutine thread after AioContext change Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 06/15] test-block-iothread: Job coroutine thread after AioContext switch Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 07/15] qemu-img: Use IEC binary prefixes for size constants Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 08/15] qcow2: Replace bdrv_write() with bdrv_pwrite() Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 09/15] vdi: Replace bdrv_{read, write}() with bdrv_{pread, pwrite}() Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 10/15] vvfat: " Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 11/15] block: Remove bdrv_read() and bdrv_write() Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 12/15] qcow2: Remove BDRVQcow2State.cluster_sectors Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 13/15] qemu-img: Allow rebase with no input base Kevin Wolf
2019-05-20 15:33   ` Peter Maydell
2019-05-10 16:16 ` [Qemu-devel] [PULL 14/15] qemu-img: Use zero writes after source backing EOF Kevin Wolf
2019-05-10 16:16 ` [Qemu-devel] [PULL 15/15] iotests: Add test for rebase without input base Kevin Wolf
2019-05-13  9:44 ` [Qemu-devel] [PULL 00/15] Block layer patches Peter Maydell

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=20190510161614.23236-5-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --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).