[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/14] tests: wait for migration completion before looking for STO
From: |
Thomas Huth |
Subject: |
[PULL 08/14] tests: wait for migration completion before looking for STOP event |
Date: |
Tue, 5 Jul 2022 12:38:10 +0200 |
From: Daniel P. Berrangé <berrange@redhat.com>
When moving into the convergance phase, the precopy tests will first
look for a STOP event and once found will look for migration completion
status. If the test VM is not converging, the test suite will be waiting
for the STOP event forever. If we wait for the migration completion
status first, then we will trigger the previously added timeout and
prevent the test hanging forever.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220628105434.295905-3-berrange@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
tests/qtest/migration-test.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index d33e8060f9..ac9e303b1f 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -1232,6 +1232,10 @@ static void test_precopy_common(MigrateCommon *args)
migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME);
+ /* We do this first, as it has a timeout to stop us
+ * hanging forever if migration didn't converge */
+ wait_for_migration_complete(from);
+
if (!got_stop) {
qtest_qmp_eventwait(from, "STOP");
}
@@ -1239,7 +1243,6 @@ static void test_precopy_common(MigrateCommon *args)
qtest_qmp_eventwait(to, "RESUME");
wait_for_serial("dest_serial");
- wait_for_migration_complete(from);
}
if (args->finish_hook) {
--
2.31.1
- [PULL 00/14] Testing and misc patches, Thomas Huth, 2022/07/05
- [PULL 02/14] tests/fp: Do not build softfloat3 tests if TCG is disabled, Thomas Huth, 2022/07/05
- [PULL 04/14] gitlab: tweak comments in edk2/opensbi jobs, Thomas Huth, 2022/07/05
- [PULL 01/14] tests: fix test-cutils leaks, Thomas Huth, 2022/07/05
- [PULL 05/14] gitlab: honour QEMU_CI variable in edk2/opensbi jobs, Thomas Huth, 2022/07/05
- [PULL 07/14] tests: wait max 120 seconds for migration test status changes, Thomas Huth, 2022/07/05
- [PULL 03/14] gitlab: normalize indentation in edk2/opensbi rules, Thomas Huth, 2022/07/05
- [PULL 08/14] tests: wait for migration completion before looking for STOP event,
Thomas Huth <=
- [PULL 10/14] tests: use consistent bandwidth/downtime limits in migration tests, Thomas Huth, 2022/07/05
- [PULL 06/14] gitlab-ci: Extend timeout for ubuntu-20.04-s390x-all to 75m, Thomas Huth, 2022/07/05
- [PULL 09/14] tests: increase migration test converge downtime to 30 seconds, Thomas Huth, 2022/07/05
- [PULL 12/14] po: add ukrainian translation, Thomas Huth, 2022/07/05
- [PULL 14/14] include/qemu/host-utils: Remove unused code in the *_overflow wrappers, Thomas Huth, 2022/07/05
- [PULL 13/14] meson.build: Require a recent version of libpng, Thomas Huth, 2022/07/05
- [PULL 11/14] disas: Remove libvixl disassembler, Thomas Huth, 2022/07/05
- Re: [PULL 00/14] Testing and misc patches, Richard Henderson, 2022/07/05