Skip to content

Commit

Permalink
iotests: specify some unsupported_imgopts for python iotests
Browse files Browse the repository at this point in the history
We are going to support IMGOPTS for python iotests. Still some iotests
will not work with common IMGOPTS used with bash iotests like
specifying refcount_bits and compat qcow2 options. So we
should define corresponding unsupported_imgopts for now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20211223160144.1097696-4-vsementsov@virtuozzo.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
  • Loading branch information
Vladimir Sementsov-Ogievskiy authored and XanClic committed Feb 1, 2022
1 parent 7c15400 commit b30b807
Show file tree
Hide file tree
Showing 15 changed files with 30 additions and 15 deletions.
3 changes: 2 additions & 1 deletion tests/qemu-iotests/044
Expand Up @@ -117,4 +117,5 @@ class TestRefcountTableGrowth(iotests.QMPTestCase):

if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['refcount_bits'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/065
Expand Up @@ -139,4 +139,5 @@ TestQMP = None

if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['refcount_bits'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/163
Expand Up @@ -169,4 +169,5 @@ ShrinkBaseClass = None

if __name__ == '__main__':
iotests.main(supported_fmts=['raw', 'qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['compat'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/165
Expand Up @@ -157,4 +157,5 @@ class TestPersistentDirtyBitmap(iotests.QMPTestCase):

if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['compat'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/196
Expand Up @@ -65,4 +65,5 @@ class TestInvalidateAutoclear(iotests.QMPTestCase):

if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['compat'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/242
Expand Up @@ -26,7 +26,8 @@ from iotests import qemu_img_create, qemu_io, qemu_img_pipe, \
file_path, img_info_log, log, filter_qemu_io

iotests.script_initialize(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['refcount_bits', 'compat'])

disk = file_path('disk')
chunk = 256 * 1024
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/246
Expand Up @@ -23,7 +23,8 @@
import iotests
from iotests import log

iotests.script_initialize(supported_fmts=['qcow2'])
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['compat'])
size = 64 * 1024 * 1024 * 1024
gran_small = 32 * 1024
gran_large = 128 * 1024
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/254
Expand Up @@ -22,7 +22,8 @@
import iotests
from iotests import qemu_img_create, file_path, log

iotests.script_initialize(supported_fmts=['qcow2'])
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['compat'])

disk, top = file_path('disk', 'top')
size = 1024 * 1024
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/260
Expand Up @@ -23,7 +23,8 @@ import iotests
from iotests import qemu_img_create, file_path, log, filter_qmp_event

iotests.script_initialize(
supported_fmts=['qcow2']
supported_fmts=['qcow2'],
unsupported_imgopts=['compat']
)

base, top = file_path('base', 'top')
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/274
Expand Up @@ -23,7 +23,8 @@
import iotests

iotests.script_initialize(supported_fmts=['qcow2'],
supported_platforms=['linux'])
supported_platforms=['linux'],
unsupported_imgopts=['refcount_bits', 'compat'])

size_short = 1 * 1024 * 1024
size_long = 2 * 1024 * 1024
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/281
Expand Up @@ -245,4 +245,5 @@ class TestBlockdevBackupAbort(iotests.QMPTestCase):

if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
supported_protocols=['file'],
unsupported_imgopts=['compat'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/303
Expand Up @@ -23,7 +23,8 @@ import iotests
import subprocess
from iotests import qemu_img_create, qemu_io, file_path, log, filter_qemu_io

iotests.script_initialize(supported_fmts=['qcow2'])
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['refcount_bits', 'compat'])

disk = file_path('disk')
chunk = 1024 * 1024
Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/tests/migrate-bitmaps-postcopy-test
Expand Up @@ -272,4 +272,5 @@ class TestDirtyBitmapPostcopyMigration(iotests.QMPTestCase):


if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'])
iotests.main(supported_fmts=['qcow2'],
unsupported_imgopts=['compat'])
3 changes: 2 additions & 1 deletion tests/qemu-iotests/tests/migrate-bitmaps-test
Expand Up @@ -307,7 +307,8 @@ def main() -> None:

iotests.main(
supported_fmts=['qcow2'],
supported_protocols=['file']
supported_protocols=['file'],
unsupported_imgopts=['compat']
)


Expand Down
3 changes: 2 additions & 1 deletion tests/qemu-iotests/tests/remove-bitmap-from-backing
Expand Up @@ -21,7 +21,8 @@
import iotests
from iotests import log, qemu_img_create, qemu_img, qemu_img_pipe

iotests.script_initialize(supported_fmts=['qcow2'])
iotests.script_initialize(supported_fmts=['qcow2'],
unsupported_imgopts=['compat'])

top, base = iotests.file_path('top', 'base')
size = '1M'
Expand Down

0 comments on commit b30b807

Please sign in to comment.