| Message ID | 20171026075222.27798-9-quintela@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Oct 26, 2017 at 09:52:20AM +0200, Juan Quintela wrote: > Once there, make postcopy test to use the new commands now that we > have other test for deprecated ones > > Signed-off-by: Juan Quintela <quintela@redhat.com> > --- > tests/migration-test.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- > 1 file changed, 46 insertions(+), 2 deletions(-) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index 338254bafe..b72dff3917 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -545,8 +545,8 @@ static void test_postcopy(void) > * quickly, but that it doesn't complete precopy even on a slow > * machine, so also set the downtime. > */ > - migrate_set_speed(from, "100000000"); > - migrate_set_downtime(from, 0.001); > + migrate_set_parameter(from, "max-bandwidth", "1000000000"); > + migrate_set_parameter(from, "downtime-limit", "1"); > > /* Wait for the first serial output from the source */ > wait_for_serial("src_serial"); > @@ -573,6 +573,49 @@ static void test_postcopy(void) > test_migrate_end(from, to); > } > > +static void test_precopy_deprecated(const char *uri) > +{ > + QTestState *from, *to; > + > + test_migrate_start(&from, &to, uri); > + > + /* We want to pick a speed slow enough that the test completes > + * quickly, but that it doesn't complete precopy even on a slow > + * machine, so also set the downtime. > + */ > + /* 100 ms */ > + migrate_set_downtime(from, 0.001); > + /* 1MB/s slow*/ > + migrate_set_speed(from, "1000000000"); > + > + /* Wait for the first serial output from the source */ > + wait_for_serial("src_serial"); > + > + migrate(from, uri); > + > + wait_for_migration_pass(from); > + > + /* 300ms it should converge */ > + migrate_set_downtime(from, 0.3); > + > + if (!got_stop) { > + qtest_qmp_eventwait(from, "STOP"); > + } > + qtest_qmp_eventwait(to, "RESUME"); > + > + wait_for_serial("dest_serial"); > + wait_for_migration_complete(from); > + > + test_migrate_end(from, to); Again, instead of doing real migration to test deprecated commands, how about just set/check them one by one? After all we have migrate_check_parameter() now, which seems even easier than before. Thanks, > +} > + > +static void test_deprecated_unix(void) > +{ > + char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); > + > + test_precopy_deprecated(uri); > + g_free(uri); > +} > > static void test_precopy(const char *uri) > { > @@ -648,6 +691,7 @@ int main(int argc, char **argv) > > qtest_add_func("/migration/precopy/unix", test_precopy_unix); > qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); > + qtest_add_func("/migration/deprecated/unix", test_deprecated_unix); > qtest_add_func("/migration/postcopy/unix", test_postcopy); > > ret = g_test_run(); > -- > 2.13.6 >
diff --git a/tests/migration-test.c b/tests/migration-test.c index 338254bafe..b72dff3917 100644 --- a/tests/migration-test.c +++ b/tests/migration-test.c @@ -545,8 +545,8 @@ static void test_postcopy(void) * quickly, but that it doesn't complete precopy even on a slow * machine, so also set the downtime. */ - migrate_set_speed(from, "100000000"); - migrate_set_downtime(from, 0.001); + migrate_set_parameter(from, "max-bandwidth", "1000000000"); + migrate_set_parameter(from, "downtime-limit", "1"); /* Wait for the first serial output from the source */ wait_for_serial("src_serial"); @@ -573,6 +573,49 @@ static void test_postcopy(void) test_migrate_end(from, to); } +static void test_precopy_deprecated(const char *uri) +{ + QTestState *from, *to; + + test_migrate_start(&from, &to, uri); + + /* We want to pick a speed slow enough that the test completes + * quickly, but that it doesn't complete precopy even on a slow + * machine, so also set the downtime. + */ + /* 100 ms */ + migrate_set_downtime(from, 0.001); + /* 1MB/s slow*/ + migrate_set_speed(from, "1000000000"); + + /* Wait for the first serial output from the source */ + wait_for_serial("src_serial"); + + migrate(from, uri); + + wait_for_migration_pass(from); + + /* 300ms it should converge */ + migrate_set_downtime(from, 0.3); + + if (!got_stop) { + qtest_qmp_eventwait(from, "STOP"); + } + qtest_qmp_eventwait(to, "RESUME"); + + wait_for_serial("dest_serial"); + wait_for_migration_complete(from); + + test_migrate_end(from, to); +} + +static void test_deprecated_unix(void) +{ + char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); + + test_precopy_deprecated(uri); + g_free(uri); +} static void test_precopy(const char *uri) { @@ -648,6 +691,7 @@ int main(int argc, char **argv) qtest_add_func("/migration/precopy/unix", test_precopy_unix); qtest_add_func("/migration/precopy/tcp", test_precopy_tcp); + qtest_add_func("/migration/deprecated/unix", test_deprecated_unix); qtest_add_func("/migration/postcopy/unix", test_postcopy); ret = g_test_run();
Once there, make postcopy test to use the new commands now that we have other test for deprecated ones Signed-off-by: Juan Quintela <quintela@redhat.com> --- tests/migration-test.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 46 insertions(+), 2 deletions(-)