| Message ID | 20191025145023.6182-1-vsementsov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | qemu-iotests: restrict 264 to qcow2 only | expand |
On 10/25/19 9:50 AM, Vladimir Sementsov-Ogievskiy wrote: > 264 is unprepared to run with different formats, for example luks needs > handling keys, cloop doesn't support image creation, vpc creates image > larger than requested (which breaks "Backup completed: 5242880" in test > output). > > The test is here to check nbd-reconnect feature and we actually don't > need it for all formats. Let's restrict it to qcow2 only. > > Reported-by: Max Reitz <mreitz@redhat.com> > Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> > --- > tests/qemu-iotests/264 | 2 ++ > 1 file changed, 2 insertions(+) Reviewed-by: Eric Blake <eblake@redhat.com> I will queue through my NBD tree; it may miss soft freeze (due to my travel schedule for KVM Forum), but is definite 4.2 material, so it will be in by rc1. > > diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 > index c8cd97ae2b..131366422b 100755 > --- a/tests/qemu-iotests/264 > +++ b/tests/qemu-iotests/264 > @@ -24,6 +24,8 @@ import iotests > from iotests import qemu_img_create, qemu_io_silent_check, file_path, \ > qemu_nbd_popen, log > > +iotests.verify_image_format(supported_fmts=['qcow2']) > + > disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') > nbd_uri = 'nbd+unix:///?socket=' + nbd_sock > size = 5 * 1024 * 1024 >
On 25.10.19 17:38, Eric Blake wrote: > On 10/25/19 9:50 AM, Vladimir Sementsov-Ogievskiy wrote: >> 264 is unprepared to run with different formats, for example luks needs >> handling keys, cloop doesn't support image creation, vpc creates image >> larger than requested (which breaks "Backup completed: 5242880" in test >> output). >> >> The test is here to check nbd-reconnect feature and we actually don't >> need it for all formats. Let's restrict it to qcow2 only. >> >> Reported-by: Max Reitz <mreitz@redhat.com> >> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> >> --- >> tests/qemu-iotests/264 | 2 ++ >> 1 file changed, 2 insertions(+) > > Reviewed-by: Eric Blake <eblake@redhat.com> > > I will queue through my NBD tree; it may miss soft freeze (due to my > travel schedule for KVM Forum), but is definite 4.2 material, so it will > be in by rc1. Hm, well. I need this patch anyway or my pre-pull-request tests won’t pass. So I suppose there is no reason for me not to take it. O:-) Max
diff --git a/tests/qemu-iotests/264 b/tests/qemu-iotests/264 index c8cd97ae2b..131366422b 100755 --- a/tests/qemu-iotests/264 +++ b/tests/qemu-iotests/264 @@ -24,6 +24,8 @@ import iotests from iotests import qemu_img_create, qemu_io_silent_check, file_path, \ qemu_nbd_popen, log +iotests.verify_image_format(supported_fmts=['qcow2']) + disk_a, disk_b, nbd_sock = file_path('disk_a', 'disk_b', 'nbd-sock') nbd_uri = 'nbd+unix:///?socket=' + nbd_sock size = 5 * 1024 * 1024
264 is unprepared to run with different formats, for example luks needs handling keys, cloop doesn't support image creation, vpc creates image larger than requested (which breaks "Backup completed: 5242880" in test output). The test is here to check nbd-reconnect feature and we actually don't need it for all formats. Let's restrict it to qcow2 only. Reported-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com> --- tests/qemu-iotests/264 | 2 ++ 1 file changed, 2 insertions(+)