[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 25/46] tests/acceptance/migration: Factor out assert_migration()
From: |
Philippe Mathieu-Daudé |
Subject: |
[PULL 25/46] tests/acceptance/migration: Factor out assert_migration() |
Date: |
Thu, 6 Feb 2020 22:19:15 +0100 |
From: Oksana Vohchana <address@hidden>
We are going to reuse this code when testing different transport
methods, so factor it out first
Signed-off-by: Oksana Vohchana <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-Id: <address@hidden>
[PMD: Split patch in 2, reworded subject and description]
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
tests/acceptance/migration.py | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/tests/acceptance/migration.py b/tests/acceptance/migration.py
index a44c1ae58f..3db733b1ce 100644
--- a/tests/acceptance/migration.py
+++ b/tests/acceptance/migration.py
@@ -24,6 +24,16 @@ class Migration(Test):
def migration_finished(vm):
return vm.command('query-migrate')['status'] in ('completed', 'failed')
+ def assert_migration(self, src_vm, dst_vm):
+ wait.wait_for(self.migration_finished,
+ timeout=self.timeout,
+ step=0.1,
+ args=(src_vm,))
+ self.assertEqual(src_vm.command('query-migrate')['status'],
'completed')
+ self.assertEqual(dst_vm.command('query-migrate')['status'],
'completed')
+ self.assertEqual(dst_vm.command('query-status')['status'], 'running')
+
self.assertEqual(src_vm.command('query-status')['status'],'postmigrate')
+
def _get_free_port(self):
port = network.find_free_port()
if port is None:
@@ -38,13 +48,4 @@ class Migration(Test):
dest_vm.launch()
source_vm.launch()
source_vm.qmp('migrate', uri=dest_uri)
- wait.wait_for(
- self.migration_finished,
- timeout=self.timeout,
- step=0.1,
- args=(source_vm,)
- )
- self.assertEqual(dest_vm.command('query-migrate')['status'],
'completed')
- self.assertEqual(source_vm.command('query-migrate')['status'],
'completed')
- self.assertEqual(dest_vm.command('query-status')['status'], 'running')
- self.assertEqual(source_vm.command('query-status')['status'],
'postmigrate')
+ self.assert_migration(source_vm, dest_vm)
--
2.21.1
- [PULL 15/46] tests/boot_linux_console: fix extract_from_deb() comment, (continued)
- [PULL 15/46] tests/boot_linux_console: fix extract_from_deb() comment, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 16/46] tests/boot_linux_console: Tag Emcraft Smartfusion2 as running 'u-boot', Philippe Mathieu-Daudé, 2020/02/06
- [PULL 18/46] tests: rename virtio_seg_max_adjust to virtio_check_params, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 17/46] tests/acceptance: Add boot tests for some of the QEMU advent calendar images, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 20/46] tests/acceptance/virtio_check_params: List machine being tested, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 24/46] tests/acceptance/version: Default to -nodefaults, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 23/46] tests/acceptance/boot_linux_console: Do not use VGA on Clipper machine, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 21/46] tests/acceptance/virtio_check_params: Default to -nodefaults, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 19/46] tests/acceptance/virtio_check_params: Improve exception logging, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 22/46] tests/acceptance/virtio_check_params: Disable the test, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 25/46] tests/acceptance/migration: Factor out assert_migration(),
Philippe Mathieu-Daudé <=
- [PULL 27/46] tests/acceptance/migration: Test UNIX transport when migrating, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 26/46] tests/acceptance/migration: Factor out do_migrate(), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 28/46] tests/acceptance/migration: Test EXEC transport when migrating, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 29/46] tests/acceptance/migration: Add the 'migration' tag, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 30/46] tests/acceptance/migration: Default to -nodefaults, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 31/46] scripts/checkpatch.pl: Only allow Python 3 interpreter, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 32/46] tests/qemu-iotests/check: Allow use of python3 interpreter, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 33/46] tests/qemu-iotests: Explicit usage of Python 3 (scripts with __main__), Philippe Mathieu-Daudé, 2020/02/06
- [PULL 34/46] tests: Explicit usage of Python 3, Philippe Mathieu-Daudé, 2020/02/06
- [PULL 36/46] scripts/minikconf: Explicit usage of Python 3, Philippe Mathieu-Daudé, 2020/02/06