Migrate away from HMP "info migrate_parameters", and use QMP query-migrate-parameters instead. We no longer check HMP formatting output though, but this is not meant to be a testable interface.
Signed-off-by: Marc-André Lureau <[email protected]> --- tests/qemu-iotests/300 | 32 ++++++-------------------------- 1 file changed, 6 insertions(+), 26 deletions(-) diff --git a/tests/qemu-iotests/300 b/tests/qemu-iotests/300 index bcc6fa972581..c6a7519b67ce 100755 --- a/tests/qemu-iotests/300 +++ b/tests/qemu-iotests/300 @@ -21,7 +21,6 @@ import os import random -import re from typing import Dict, List, Optional import iotests @@ -136,8 +135,8 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): Invoke migrate-set-parameters on @vm to set the given @mapping. Check for success if @error is None, or verify the error message if it is not. - On success, verify that "info migrate_parameters" on HMP returns - our mapping. (Just to check its formatting code.) + On success, verify that query-migrate-parameters returns + our mapping. """ result = vm.qmp('migrate-set-parameters', block_bitmap_mapping=mapping) @@ -145,30 +144,12 @@ class TestDirtyBitmapMigration(iotests.QMPTestCase): if error is None: self.assert_qmp(result, 'return', {}) - result = vm.qmp('human-monitor-command', - command_line='info migrate_parameters') - - m = re.search(r'^block-bitmap-mapping:\r?(\n .*)*\n', - result['return'], flags=re.MULTILINE) - hmp_mapping = m.group(0).replace('\r', '') if m else None - - self.assertEqual(hmp_mapping, self.to_hmp_mapping(mapping)) + result = vm.qmp('query-migrate-parameters') + qmp_mapping = result['return'].get('block-bitmap-mapping') + self.assertEqual(qmp_mapping, mapping) else: self.assert_qmp(result, 'error/desc', error) - @staticmethod - def to_hmp_mapping(mapping: BlockBitmapMapping) -> str: - result = 'block-bitmap-mapping:\n' - - for node in mapping: - result += f" '{node['node-name']}' -> '{node['alias']}'\n" - - assert isinstance(node['bitmaps'], list) - for bitmap in node['bitmaps']: - result += f" '{bitmap['name']}' -> '{bitmap['alias']}'\n" - - return result - class TestAliasMigration(TestDirtyBitmapMigration): src_node_name = 'node0' @@ -683,5 +664,4 @@ class TestAliasTransformMigration(TestDirtyBitmapMigration): self.verify_dest_error(None) if __name__ == '__main__': - iotests.main(supported_protocols=['file'], - require_hmp=True) + iotests.main(supported_protocols=['file']) -- 2.56.0.rc0.29.g47ce80527c56
