@@ -1058,15 +1058,15 @@ static void test_postcopy_tls_psk(void)
test_postcopy_common(&args);
}
-static void test_postcopy_recovery(void)
+static void test_postcopy_recovery_common(MigrateStart *args)
{
- MigrateStart args = {
- .hide_stderr = true,
- };
QTestState *from, *to;
g_autofree char *uri = NULL;
- if (migrate_postcopy_prepare(&from, &to, &args)) {
+ /* Always hide errors for postcopy recover tests since they're expected */
+ args->hide_stderr = true;
+
+ if (migrate_postcopy_prepare(&from, &to, args)) {
return;
}
@@ -1117,7 +1117,21 @@ static void test_postcopy_recovery(void)
/* Restore the postcopy bandwidth to unlimited */
migrate_set_parameter_int(from, "max-postcopy-bandwidth", 0);
- migrate_postcopy_complete(from, to, &args);
+ migrate_postcopy_complete(from, to, args);
+}
+
+static void test_postcopy_recovery(void)
+{
+ MigrateStart args = { };
+
+ test_postcopy_recovery_common(&args);
+}
+
+static void test_postcopy_recovery_tls_psk(void)
+{
+ MigrateStart args = { .postcopy_tls = true };
+
+ test_postcopy_recovery_common(&args);
}
static void test_baddest(void)
@@ -2169,7 +2183,12 @@ int main(int argc, char **argv)
*/
qtest_add_func("/migration/postcopy/tls/psk", test_postcopy_tls_psk);
#endif /* CONFIG_GNUTLS */
- qtest_add_func("/migration/postcopy/recovery", test_postcopy_recovery);
+ qtest_add_func("/migration/postcopy/recovery/plain",
+ test_postcopy_recovery);
+#ifdef CONFIG_GNUTLS
+ qtest_add_func("/migration/postcopy/recovery/tls/psk",
+ test_postcopy_recovery_tls_psk);
+#endif /* CONFIG_GNUTLS */
qtest_add_func("/migration/bad_dest", test_baddest);
qtest_add_func("/migration/precopy/unix/plain", test_precopy_unix_plain);
qtest_add_func("/migration/precopy/unix/xbzrle", test_precopy_unix_xbzrle);
It's easy to build this upon the postcopy tls test. Rename the old postcopy recovery test to postcopy/recovery/plain. Signed-off-by: Peter Xu <peterx@redhat.com> --- tests/qtest/migration-test.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-)