[21/23] iotests/240: Create socket in $SOCK_DIR

Message ID	20191010152457.17713-22-mreitz@redhat.com
State	New
Headers	show Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> From: Max Reitz <mreitz@redhat.com> To: qemu-block@nongnu.org Subject: [PATCH 21/23] iotests/240: Create socket in $SOCK_DIR Date: Thu, 10 Oct 2019 17:24:55 +0200 Message-Id: <20191010152457.17713-22-mreitz@redhat.com> In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com> References: <20191010152457.17713-1-mreitz@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: list Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>, qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>
Series	iotests: Add and use $SOCK_DIR \| expand [00/23] iotests: Add and use $SOCK_DIR [01/23] iotests: Introduce $SOCK_DIR [02/23] iotests.py: Store socket files in $SOCK_DIR [03/23] iotests.py: Add @base_dir to FilePaths etc. [04/23] iotests: Filter $SOCK_DIR [05/23] iotests: Let common.nbd create socket in $SOCK_DIR [06/23] iotests/083: Create socket in $SOCK_DIR [07/23] iotests/140: Create socket in $SOCK_DIR [08/23] iotests/143: Create socket in $SOCK_DIR [09/23] iotests/147: Create socket in $SOCK_DIR [10/23] iotests/181: Create socket in $SOCK_DIR [11/23] iotests/182: Create socket in $SOCK_DIR [12/23] iotests/183: Create socket in $SOCK_DIR [13/23] iotests/192: Create socket in $SOCK_DIR [14/23] iotests/194: Create sockets in $SOCK_DIR [15/23] iotests/201: Create socket in $SOCK_DIR [16/23] iotests/205: Create socket in $SOCK_DIR [17/23] iotests/208: Create socket in $SOCK_DIR [18/23] iotests/209: Create socket in $SOCK_DIR [19/23] iotests/222: Create socket in $SOCK_DIR [20/23] iotests/223: Create socket in $SOCK_DIR [21/23] iotests/240: Create socket in $SOCK_DIR [22/23] iotests/267: Create socket in $SOCK_DIR [23/23] iotests: Drop TEST_DIR filter from _filter_nbd

Message ID

20191010152457.17713-22-mreitz@redhat.com

State

New

Headers

From: Max Reitz <mreitz@redhat.com>
To: qemu-block@nongnu.org
Subject: [PATCH 21/23] iotests/240: Create socket in $SOCK_DIR
Date: Thu, 10 Oct 2019 17:24:55 +0200
Message-Id: <20191010152457.17713-22-mreitz@redhat.com>
In-Reply-To: <20191010152457.17713-1-mreitz@redhat.com>
References: <20191010152457.17713-1-mreitz@redhat.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Precedence: list
Cc: Kevin Wolf <kwolf@redhat.com>, Thomas Huth <thuth@redhat.com>,
	qemu-devel@nongnu.org, Max Reitz <mreitz@redhat.com>
Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org
Sender: "Qemu-devel"
	<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>

Series

iotests: Add and use $SOCK_DIR | expand

Comments

Eric Blake Oct. 10, 2019, 7:46 p.m. UTC | #1

On 10/10/19 10:24 AM, Max Reitz wrote:
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/240 | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)

Reviewed-by: Eric Blake <eblake@redhat.com>

> 
> diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
> index f73bc07d80..8b4337b58d 100755
> --- a/tests/qemu-iotests/240
> +++ b/tests/qemu-iotests/240
> @@ -29,7 +29,7 @@ status=1	# failure is the default!
>   
>   _cleanup()
>   {
> -    rm -f "$TEST_DIR/nbd"
> +    rm -f "$SOCK_DIR/nbd"
>   }
>   trap "_cleanup; exit \$status" 0 1 2 3 15
>   
> @@ -135,7 +135,7 @@ echo
>   run_qemu <<EOF
>   { "execute": "qmp_capabilities" }
>   { "execute": "blockdev-add", "arguments": {"driver": "null-co", "read-zeroes": true, "node-name": "hd0", "read-only": true}}
> -{ "execute": "nbd-server-start", "arguments": {"addr":{"type":"unix","data":{"path":"$TEST_DIR/nbd"}}}}
> +{ "execute": "nbd-server-start", "arguments": {"addr":{"type":"unix","data":{"path":"$SOCK_DIR/nbd"}}}}
>   { "execute": "nbd-server-add", "arguments": {"device":"hd0"}}
>   { "execute": "object-add", "arguments": {"qom-type": "iothread", "id": "iothread0"}}
>   { "execute": "device_add", "arguments": {"id": "scsi0", "driver": "${virtio_scsi}", "iothread": "iothread0"}}
>

diff --git a/tests/qemu-iotests/240 b/tests/qemu-iotests/240
index f73bc07d80..8b4337b58d 100755
--- a/tests/qemu-iotests/240
+++ b/tests/qemu-iotests/240
@@ -29,7 +29,7 @@  status=1	# failure is the default!
 
 _cleanup()
 {
-    rm -f "$TEST_DIR/nbd"
+    rm -f "$SOCK_DIR/nbd"
 }
 trap "_cleanup; exit \$status" 0 1 2 3 15
 
@@ -135,7 +135,7 @@  echo
 run_qemu <<EOF
 { "execute": "qmp_capabilities" }
 { "execute": "blockdev-add", "arguments": {"driver": "null-co", "read-zeroes": true, "node-name": "hd0", "read-only": true}}
-{ "execute": "nbd-server-start", "arguments": {"addr":{"type":"unix","data":{"path":"$TEST_DIR/nbd"}}}}
+{ "execute": "nbd-server-start", "arguments": {"addr":{"type":"unix","data":{"path":"$SOCK_DIR/nbd"}}}}
 { "execute": "nbd-server-add", "arguments": {"device":"hd0"}}
 { "execute": "object-add", "arguments": {"qom-type": "iothread", "id": "iothread0"}}
 { "execute": "device_add", "arguments": {"id": "scsi0", "driver": "${virtio_scsi}", "iothread": "iothread0"}}

[21/23] iotests/240: Create socket in $SOCK_DIR

Commit Message

Comments

Patch