| Message ID | 20240125135237.189493-1-andrey.drobyshev@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | iotests/264: Use iotests.sock_dir for socket creation | expand |
On Thu, Jan 25, 2024 at 03:52:37PM +0200, Andrey Drobyshev wrote: > If socket path is too long (longer than 108 bytes), socket can't be > opened. This might lead to failure when test dir path is long enough. > Make sure socket is created in iotests.sock_dir to avoid such a case. > > This commit basically aligns iotests/264 with the rest of iotests. > > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> > --- > tests/qemu-iotests/264 | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) Reviewed-by: Eric Blake <eblake@redhat.com> > > diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 > index c532ccd809..c6ba2754e2 100755 > --- a/tests/qemu-iotests/264 > +++ b/tests/qemu-iotests/264 > @@ -25,7 +25,8 @@ import os > import iotests > from iotests import qemu_img_create, file_path, qemu_nbd_popen > > -disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') > +disk_a, disk_b = file_path('disk_a', 'disk_b') > +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir) > nbd_uri = 'nbd+unix:///?socket=' + nbd_sock > wait_limit = 3.0 > wait_step = 0.2 > -- > 2.39.3 >
Am 25.01.2024 um 14:52 hat Andrey Drobyshev geschrieben: > If socket path is too long (longer than 108 bytes), socket can't be > opened. This might lead to failure when test dir path is long enough. > Make sure socket is created in iotests.sock_dir to avoid such a case. > > This commit basically aligns iotests/264 with the rest of iotests. > > Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> Thanks, applied to the block branch. Kevin
diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index c532ccd809..c6ba2754e2 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -25,7 +25,8 @@ import os import iotests from iotests import qemu_img_create, file_path, qemu_nbd_popen -disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') +disk_a, disk_b = file_path('disk_a', 'disk_b') +nbd_sock = file_path('nbd-sock', base_dir=iotests.sock_dir) nbd_uri = 'nbd+unix:///?socket=' + nbd_sock wait_limit = 3.0 wait_step = 0.2
If socket path is too long (longer than 108 bytes), socket can't be opened. This might lead to failure when test dir path is long enough. Make sure socket is created in iotests.sock_dir to avoid such a case. This commit basically aligns iotests/264 with the rest of iotests. Signed-off-by: Andrey Drobyshev <andrey.drobyshev@virtuozzo.com> --- tests/qemu-iotests/264 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)