[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/18] tests: expand the migration precopy helper to support fail
From: |
Daniel P . Berrangé |
Subject: |
[PATCH 11/18] tests: expand the migration precopy helper to support failures |
Date: |
Wed, 2 Mar 2022 17:49:25 +0000 |
The migration precopy testing helper function always expects the
migration to run to a completion state. There will be test scenarios
for TLS where expect either the client or server to fail the migration.
This expands the helper to cope with these scenarios.
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
tests/qtest/migration-test.c | 47 +++++++++++++++++++++++++++++-------
1 file changed, 38 insertions(+), 9 deletions(-)
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c
index 2082c58e8b..e40b408988 100644
--- a/tests/qtest/migration-test.c
+++ b/tests/qtest/migration-test.c
@@ -827,17 +827,32 @@ typedef void (*TestMigrateFinishHook)(QTestState *from,
* @connect_uri: the URI for the src QEMU to connect to
* @start_hook: (optional) callback to run at start to set migration parameters
* @finish_hook: (optional) callback to run at finish to cleanup
+ * @expect_fail: true if we expect migration to fail
+ * @dst_quit: true if we expect the dst QEMU to quit with an
+ * abnormal exit status on failure
* @dirty_ring: true to use dirty ring tracking
*
* If @connect_uri is NULL, then it will query the dst
* QEMU for its actual listening address and use that
* as the connect address. This allows for dynamically
* picking a free TCP port.
+ *
+ * If @expect_fail is true then we expect the migration process to
+ * fail instead of completing. There can be a variety of reasons
+ * and stages in which this may happen. If a failure is expected
+ * to happen at time of establishing the connection, then @dst_quit
+ * should be false to indicate that the dst QEMU is espected to
+ * stay running and accept future migration connections. If a
+ * failure is expected to happen while processing the migration
+ * stream, then @dst_quit should be true to indicate that the
+ * dst QEMU is expected to quit with non-zero exit status
*/
static void test_precopy_common(const char *listen_uri,
const char *connect_uri,
TestMigrateStartHook start_hook,
TestMigrateFinishHook finish_hook,
+ bool expect_fail,
+ bool dst_quit,
bool dirty_ring)
{
MigrateStart *args = migrate_start_new();
@@ -875,24 +890,32 @@ static void test_precopy_common(const char *listen_uri,
migrate_qmp(from, connect_uri, "{}");
- wait_for_migration_pass(from);
+ if (expect_fail) {
+ wait_for_migration_fail(from, !dst_quit);
- migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME);
+ if (dst_quit) {
+ qtest_set_expected_status(to, 1);
+ }
+ } else {
+ wait_for_migration_pass(from);
- if (!got_stop) {
- qtest_qmp_eventwait(from, "STOP");
- }
+ migrate_set_parameter_int(from, "downtime-limit", CONVERGE_DOWNTIME);
- qtest_qmp_eventwait(to, "RESUME");
+ if (!got_stop) {
+ qtest_qmp_eventwait(from, "STOP");
+ }
- wait_for_serial("dest_serial");
- wait_for_migration_complete(from);
+ qtest_qmp_eventwait(to, "RESUME");
+
+ wait_for_serial("dest_serial");
+ wait_for_migration_complete(from);
+ }
if (finish_hook) {
finish_hook(from, to, data_hook);
}
- test_migrate_end(from, to, true);
+ test_migrate_end(from, to, !expect_fail);
}
static void test_precopy_unix_common(bool dirty_ring)
@@ -903,6 +926,8 @@ static void test_precopy_unix_common(bool dirty_ring)
uri,
NULL, /* start_hook */
NULL, /* finish_hook */
+ false, /* expect_fail */
+ false, /* dst_quit */
dirty_ring);
}
@@ -1012,6 +1037,8 @@ static void test_precopy_tcp(void)
NULL, /* connect_uri */
NULL, /* start_hook */
NULL, /* finish_hook */
+ false, /* expect_fail */
+ false, /* dst_quit */
false /* dirty_ring */);
}
@@ -1079,6 +1106,8 @@ static void test_migrate_fd_proto(void)
"fd:fd-mig",
test_migrate_fd_start_hook,
test_migrate_fd_finish_hook,
+ false, /* expect_fail */
+ false, /* dst_quit */
false /* dirty_ring */);
}
--
2.34.1
- Re: [PATCH 07/18] migration: fix use of TLS PSK credentials with a UNIX socket, (continued)
- [PATCH 08/18] tests: merge code for UNIX and TCP migration pre-copy tests, Daniel P . Berrangé, 2022/03/02
- [PATCH 09/18] tests: introduce ability to provide hooks for migration precopy test, Daniel P . Berrangé, 2022/03/02
- [PATCH 10/18] tests: switch migration FD passing test to use common precopy helper, Daniel P . Berrangé, 2022/03/02
- [PATCH 11/18] tests: expand the migration precopy helper to support failures,
Daniel P . Berrangé <=
- [PATCH 12/18] tests: add migration tests of TLS with PSK credentials, Daniel P . Berrangé, 2022/03/02
- [PATCH 13/18] tests: add migration tests of TLS with x509 credentials, Daniel P . Berrangé, 2022/03/02
- [PATCH 04/18] tests: print newline after QMP response in qtest logs, Daniel P . Berrangé, 2022/03/02