| Message ID | 20200227000639.9644-9-jsnow@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iotests: use python logging | expand |
On 2/27/20 1:06 AM, John Snow wrote: > It shadows (with a different type) the built-in format. > Use something else. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/qemu-iotests/055 | 3 ++- > tests/qemu-iotests/iotests.py | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 > index 82b9f5f47d..4175fff5e4 100755 > --- a/tests/qemu-iotests/055 > +++ b/tests/qemu-iotests/055 > @@ -469,7 +469,8 @@ class TestDriveCompression(iotests.QMPTestCase): > qemu_img('create', '-f', fmt, blockdev_target_img, > str(TestDriveCompression.image_len), *args) > if attach_target: > - self.vm.add_drive(blockdev_target_img, format=fmt, interface="none") > + self.vm.add_drive(blockdev_target_img, > + img_format=fmt, interface="none") > > self.vm.launch() > > diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py > index 214f59995e..8bf640c632 100644 > --- a/tests/qemu-iotests/iotests.py > +++ b/tests/qemu-iotests/iotests.py > @@ -492,21 +492,21 @@ def add_drive_raw(self, opts): > self._args.append(opts) > return self > > - def add_drive(self, path, opts='', interface='virtio', format=imgfmt): > + def add_drive(self, path, opts='', interface='virtio', img_format=imgfmt): > '''Add a virtio-blk drive to the VM''' > options = ['if=%s' % interface, > 'id=drive%d' % self._num_drives] > > if path is not None: > options.append('file=%s' % path) > - options.append('format=%s' % format) > + options.append('format=%s' % img_format) > options.append('cache=%s' % cachemode) > options.append('aio=%s' % aiomode) > > if opts: > options.append(opts) > > - if format == 'luks' and 'key-secret' not in opts: > + if img_format == 'luks' and 'key-secret' not in opts: > # default luks support > if luks_default_secret_object not in self._args: > self.add_object(luks_default_secret_object) > Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
On 27.02.20 01:06, John Snow wrote: > It shadows (with a different type) the built-in format. > Use something else. > > Signed-off-by: John Snow <jsnow@redhat.com> > --- > tests/qemu-iotests/055 | 3 ++- > tests/qemu-iotests/iotests.py | 6 +++--- > 2 files changed, 5 insertions(+), 4 deletions(-) Reviewed-by: Max Reitz <mreitz@redhat.com>
diff --git a/tests/qemu-iotests/055 b/tests/qemu-iotests/055 index 82b9f5f47d..4175fff5e4 100755 --- a/tests/qemu-iotests/055 +++ b/tests/qemu-iotests/055 @@ -469,7 +469,8 @@ class TestDriveCompression(iotests.QMPTestCase): qemu_img('create', '-f', fmt, blockdev_target_img, str(TestDriveCompression.image_len), *args) if attach_target: - self.vm.add_drive(blockdev_target_img, format=fmt, interface="none") + self.vm.add_drive(blockdev_target_img, + img_format=fmt, interface="none") self.vm.launch() diff --git a/tests/qemu-iotests/iotests.py b/tests/qemu-iotests/iotests.py index 214f59995e..8bf640c632 100644 --- a/tests/qemu-iotests/iotests.py +++ b/tests/qemu-iotests/iotests.py @@ -492,21 +492,21 @@ def add_drive_raw(self, opts): self._args.append(opts) return self - def add_drive(self, path, opts='', interface='virtio', format=imgfmt): + def add_drive(self, path, opts='', interface='virtio', img_format=imgfmt): '''Add a virtio-blk drive to the VM''' options = ['if=%s' % interface, 'id=drive%d' % self._num_drives] if path is not None: options.append('file=%s' % path) - options.append('format=%s' % format) + options.append('format=%s' % img_format) options.append('cache=%s' % cachemode) options.append('aio=%s' % aiomode) if opts: options.append(opts) - if format == 'luks' and 'key-secret' not in opts: + if img_format == 'luks' and 'key-secret' not in opts: # default luks support if luks_default_secret_object not in self._args: self.add_object(luks_default_secret_object)
It shadows (with a different type) the built-in format. Use something else. Signed-off-by: John Snow <jsnow@redhat.com> --- tests/qemu-iotests/055 | 3 ++- tests/qemu-iotests/iotests.py | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-)