Skip to content

Commit

Permalink
iotests/migrate-bitmaps-test: delint
Browse files Browse the repository at this point in the history
Mostly uninteresting stuff. Move the test injections under a function
named main() so that the variables used during that process aren't in
the global scope.

Signed-off-by: John Snow <jsnow@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Message-Id: <20210923180715.4168522-6-jsnow@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
  • Loading branch information
jnsnow authored and kevmw committed Oct 6, 2021
1 parent ac74246 commit 2296899
Showing 1 changed file with 28 additions and 22 deletions.
50 changes: 28 additions & 22 deletions tests/qemu-iotests/tests/migrate-bitmaps-test
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#

import os
import itertools
import operator
import os
import re

import iotests
from iotests import qemu_img, qemu_img_create, Timeout

Expand Down Expand Up @@ -224,25 +225,6 @@ def inject_test_case(klass, suffix, method, *args, **kwargs):
setattr(klass, 'test_' + method + suffix, lambda self: mc(self))


for cmb in list(itertools.product((True, False), repeat=5)):
name = ('_' if cmb[0] else '_not_') + 'persistent_'
name += ('_' if cmb[1] else '_not_') + 'migbitmap_'
name += '_online' if cmb[2] else '_offline'
name += '_shared' if cmb[3] else '_nonshared'
if cmb[4]:
name += '__pre_shutdown'

inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration',
*list(cmb))

for cmb in list(itertools.product((True, False), repeat=2)):
name = ('_' if cmb[0] else '_not_') + 'persistent_'
name += ('_' if cmb[1] else '_not_') + 'migbitmap'

inject_test_case(TestDirtyBitmapMigration, name,
'do_test_migration_resume_source', *list(cmb))


class TestDirtyBitmapBackingMigration(iotests.QMPTestCase):
def setUp(self):
qemu_img_create('-f', iotests.imgfmt, base_a, size)
Expand Down Expand Up @@ -304,6 +286,30 @@ class TestDirtyBitmapBackingMigration(iotests.QMPTestCase):
self.assert_qmp(result, 'return', {})


def main() -> None:
for cmb in list(itertools.product((True, False), repeat=5)):
name = ('_' if cmb[0] else '_not_') + 'persistent_'
name += ('_' if cmb[1] else '_not_') + 'migbitmap_'
name += '_online' if cmb[2] else '_offline'
name += '_shared' if cmb[3] else '_nonshared'
if cmb[4]:
name += '__pre_shutdown'

inject_test_case(TestDirtyBitmapMigration, name, 'do_test_migration',
*list(cmb))

for cmb in list(itertools.product((True, False), repeat=2)):
name = ('_' if cmb[0] else '_not_') + 'persistent_'
name += ('_' if cmb[1] else '_not_') + 'migbitmap'

inject_test_case(TestDirtyBitmapMigration, name,
'do_test_migration_resume_source', *list(cmb))

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


if __name__ == '__main__':
iotests.main(supported_fmts=['qcow2'],
supported_protocols=['file'])
main()

0 comments on commit 2296899

Please sign in to comment.