iotests/041: Fix NBD socket path

[PATCH] iotests/041: Fix NBD socket path

Max Reitz posted 1 patch 5 years, 6 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20200424134626.78945-1-mreitz@redhat.com

Test docker-mingw@fedora passed

Test docker-quick@centos7 passed

Test checkpatch passed

Test FreeBSD passed

Test asan passed

Maintainers: Max Reitz <mreitz@redhat.com>, Kevin Wolf <kwolf@redhat.com>

tests/qemu-iotests/041 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] iotests/041: Fix NBD socket path

Posted by Max Reitz 5 years, 6 months ago

We should put all UNIX socket files into the sock_dir, not test_dir.

Reported-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/qemu-iotests/041 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
index 5d67bf14bf..46bf1f6c81 100755
--- a/tests/qemu-iotests/041
+++ b/tests/qemu-iotests/041
@@ -35,7 +35,7 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img')
 quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img')
 quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img')
 
-nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
+nbd_sock_path = os.path.join(iotests.sock_dir, 'nbd.sock')
 
 class TestSingleDrive(iotests.QMPTestCase):
     image_len = 1 * 1024 * 1024 # MB
-- 
2.25.3

Re: [PATCH] iotests/041: Fix NBD socket path

Posted by Eric Blake 5 years, 6 months ago

On 4/24/20 8:46 AM, Max Reitz wrote:
> We should put all UNIX socket files into the sock_dir, not test_dir.
> 
> Reported-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>   tests/qemu-iotests/041 | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 

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

I'm happy to queue this through my NBD tree, if you don't beat me to it 
through an iotest pull request.

> diff --git a/tests/qemu-iotests/041 b/tests/qemu-iotests/041
> index 5d67bf14bf..46bf1f6c81 100755
> --- a/tests/qemu-iotests/041
> +++ b/tests/qemu-iotests/041
> @@ -35,7 +35,7 @@ quorum_img3 = os.path.join(iotests.test_dir, 'quorum3.img')
>   quorum_repair_img = os.path.join(iotests.test_dir, 'quorum_repair.img')
>   quorum_snapshot_file = os.path.join(iotests.test_dir, 'quorum_snapshot.img')
>   
> -nbd_sock_path = os.path.join(iotests.test_dir, 'nbd.sock')
> +nbd_sock_path = os.path.join(iotests.sock_dir, 'nbd.sock')
>   
>   class TestSingleDrive(iotests.QMPTestCase):
>       image_len = 1 * 1024 * 1024 # MB
> 

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org

Re: [PATCH] iotests/041: Fix NBD socket path

Posted by Stefan Hajnoczi 5 years, 6 months ago

On Fri, Apr 24, 2020 at 03:46:26PM +0200, Max Reitz wrote:
> We should put all UNIX socket files into the sock_dir, not test_dir.
> 
> Reported-by: Elena Ufimtseva <elena.ufimtseva@oracle.com>
> Signed-off-by: Max Reitz <mreitz@redhat.com>
> ---
>  tests/qemu-iotests/041 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Cool, thanks for fixing this!

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>