* Juan Quintela (quintela@redhat.com) wrote:
> We move to use migration_set_parameter() for everything.
>
> Signed-off-by: Juan Quintela <quintela@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
> ---
> tests/migration-test.c | 33 ++++++++-------------------------
> 1 file changed, 8 insertions(+), 25 deletions(-)
>
> diff --git a/tests/migration-test.c b/tests/migration-test.c
> index 9fd5dadc0d..0448bc77dc 100644
> --- a/tests/migration-test.c
> +++ b/tests/migration-test.c
> @@ -381,37 +381,20 @@ static void migrate_check_parameter(QTestState *who, const char *parameter,
> QDECREF(rsp);
> }
>
> -static void migrate_set_downtime(QTestState *who, const double value)
> +static void migrate_set_parameter(QTestState *who, const char *parameter,
> + const char *value)
> {
> QDict *rsp;
> gchar *cmd;
> - char *expected;
> - int64_t result_int;
>
> - cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime',"
> - "'arguments': { 'value': %g } }", value);
> + cmd = g_strdup_printf("{ 'execute': 'migrate-set-parameters',"
> + "'arguments': { '%s': %s } }",
> + parameter, value);
> rsp = qtest_qmp(who, cmd);
> g_free(cmd);
> g_assert(qdict_haskey(rsp, "return"));
> QDECREF(rsp);
> - result_int = value * 1000L;
> - expected = g_strdup_printf("%" PRId64, result_int);
> - migrate_check_parameter(who, "downtime-limit", expected);
> - g_free(expected);
> -}
> -
> -static void migrate_set_speed(QTestState *who, const char *value)
> -{
> - QDict *rsp;
> - gchar *cmd;
> -
> - cmd = g_strdup_printf("{ 'execute': 'migrate_set_speed',"
> - "'arguments': { 'value': %s } }", value);
> - rsp = qtest_qmp(who, cmd);
> - g_free(cmd);
> - g_assert(qdict_haskey(rsp, "return"));
> - QDECREF(rsp);
> - migrate_check_parameter(who, "max-bandwidth", value);
> + migrate_check_parameter(who, parameter, value);
> }
>
> static void migrate_set_capability(QTestState *who, const char *capability,
> @@ -543,8 +526,8 @@ static void test_migrate(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", "100000000");
> + migrate_set_parameter(from, "downtime-limit", "1");
>
> /* Wait for the first serial output from the source */
> wait_for_serial("src_serial");
> --
> 2.14.3
>
--
Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK