| Message ID | 20220524221151.18225-14-peterx@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | migration: Postcopy Preemption | expand |
* Peter Xu (peterx@redhat.com) wrote: > 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> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > --- > tests/qtest/migration-test.c | 38 +++++++++++++++++++++++++++--------- > 1 file changed, 29 insertions(+), 9 deletions(-) > > diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c > index 03f7bb0d96..12f1e3a751 100644 > --- a/tests/qtest/migration-test.c > +++ b/tests/qtest/migration-test.c > @@ -1131,17 +1131,15 @@ static void test_postcopy_tls_psk(void) > test_postcopy_common(&args); > } > > -static void test_postcopy_recovery(void) > +static void test_postcopy_recovery_common(MigrateCommon *args) > { > - MigrateCommon args = { > - .start = { > - .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->start.hide_stderr = true; > + > + if (migrate_postcopy_prepare(&from, &to, args)) { > return; > } > > @@ -1192,7 +1190,24 @@ 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) > +{ > + MigrateCommon args = { }; > + > + test_postcopy_recovery_common(&args); > +} > + > +static void test_postcopy_recovery_tls_psk(void) > +{ > + MigrateCommon args = { > + .start_hook = test_migrate_tls_psk_start_match, > + .finish_hook = test_migrate_tls_psk_finish, > + }; > + > + test_postcopy_recovery_common(&args); > } > > static void test_baddest(void) > @@ -2173,7 +2188,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); > -- > 2.32.0 >
diff --git a/tests/qtest/migration-test.c b/tests/qtest/migration-test.c index 03f7bb0d96..12f1e3a751 100644 --- a/tests/qtest/migration-test.c +++ b/tests/qtest/migration-test.c @@ -1131,17 +1131,15 @@ static void test_postcopy_tls_psk(void) test_postcopy_common(&args); } -static void test_postcopy_recovery(void) +static void test_postcopy_recovery_common(MigrateCommon *args) { - MigrateCommon args = { - .start = { - .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->start.hide_stderr = true; + + if (migrate_postcopy_prepare(&from, &to, args)) { return; } @@ -1192,7 +1190,24 @@ 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) +{ + MigrateCommon args = { }; + + test_postcopy_recovery_common(&args); +} + +static void test_postcopy_recovery_tls_psk(void) +{ + MigrateCommon args = { + .start_hook = test_migrate_tls_psk_start_match, + .finish_hook = test_migrate_tls_psk_finish, + }; + + test_postcopy_recovery_common(&args); } static void test_baddest(void) @@ -2173,7 +2188,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 | 38 +++++++++++++++++++++++++++--------- 1 file changed, 29 insertions(+), 9 deletions(-)