qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] qemu-iotests: Fix cleanup for 192
@ 2019-05-08 12:04 Kevin Wolf
  2019-05-08 12:06 ` Thomas Huth
  2019-05-08 13:02 ` [Qemu-devel] [Qemu-block] " Max Reitz
  0 siblings, 2 replies; 3+ messages in thread
From: Kevin Wolf @ 2019-05-08 12:04 UTC (permalink / raw)
  To: qemu-block; +Cc: kwolf, thuth, qemu-devel

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>
---
 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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [PATCH] qemu-iotests: Fix cleanup for 192
  2019-05-08 12:04 [Qemu-devel] [PATCH] qemu-iotests: Fix cleanup for 192 Kevin Wolf
@ 2019-05-08 12:06 ` Thomas Huth
  2019-05-08 13:02 ` [Qemu-devel] [Qemu-block] " Max Reitz
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Huth @ 2019-05-08 12:06 UTC (permalink / raw)
  To: Kevin Wolf, qemu-block; +Cc: qemu-devel

On 08/05/2019 14.04, Kevin Wolf wrote:
> 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>
> ---
>  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

That fixes the issue, indeed! Thanks!

Tested-by: Thomas Huth <thuth@redhat.com>


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-devel] [Qemu-block] [PATCH] qemu-iotests: Fix cleanup for 192
  2019-05-08 12:04 [Qemu-devel] [PATCH] qemu-iotests: Fix cleanup for 192 Kevin Wolf
  2019-05-08 12:06 ` Thomas Huth
@ 2019-05-08 13:02 ` Max Reitz
  1 sibling, 0 replies; 3+ messages in thread
From: Max Reitz @ 2019-05-08 13:02 UTC (permalink / raw)
  To: Kevin Wolf, qemu-block; +Cc: thuth, qemu-devel

[-- Attachment #1: Type: text/plain, Size: 536 bytes --]

On 08.05.19 14:04, Kevin Wolf wrote:
> 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>
> ---
>  tests/qemu-iotests/192 | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)

Well...

Reviewed-by: Max Reitz <mreitz@redhat.com>


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2019-05-08 13:05 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-08 12:04 [Qemu-devel] [PATCH] qemu-iotests: Fix cleanup for 192 Kevin Wolf
2019-05-08 12:06 ` Thomas Huth
2019-05-08 13:02 ` [Qemu-devel] [Qemu-block] " Max Reitz

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).