From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47953) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e8naI-0002j9-BQ for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:25:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e8naF-00034S-5x for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:25:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45246) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e8naE-00033z-T0 for qemu-devel@nongnu.org; Sun, 29 Oct 2017 09:24:59 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 006ACB652 for ; Sun, 29 Oct 2017 13:24:57 +0000 (UTC) Date: Sun, 29 Oct 2017 14:24:53 +0100 From: Peter Xu Message-ID: <20171029132453.GA4227@pxdev.xzpeter.org> References: <20171026075222.27798-1-quintela@redhat.com> <20171026075222.27798-6-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20171026075222.27798-6-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 05/10] tests: check that migration parameters are really assigned List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, lvivier@redhat.com On Thu, Oct 26, 2017 at 09:52:17AM +0200, Juan Quintela wrote: > Signed-off-by: Juan Quintela > --- > tests/migration-test.c | 27 ++++++++++++++++++++++++--- > 1 file changed, 24 insertions(+), 3 deletions(-) > > diff --git a/tests/migration-test.c b/tests/migration-test.c > index c429a13403..be598d3257 100644 > --- a/tests/migration-test.c > +++ b/tests/migration-test.c > @@ -354,17 +354,37 @@ static void cleanup(const char *filename) > g_free(path); > } > > -static void migrate_set_downtime(QTestState *who, const char *value) > +static void migrate_check_parameter(QTestState *who, const char *parameter, > + const char *value) > +{ > + QDict *rsp, *rsp_return; > + const char *result; > + > + rsp = wait_command(who, "{ 'execute': 'query-migrate-parameters' }"); > + rsp_return = qdict_get_qdict(rsp, "return"); > + result = g_strdup_printf("%" PRId64, > + qdict_get_try_int(rsp_return, parameter, -1)); > + g_assert_cmpstr(result, ==, value); > + QDECREF(rsp); Maybe we need to free "result" as well? I see a pull request already, so maybe another fix patch on top. Thanks, > +} > + > +static void migrate_set_downtime(QTestState *who, const double value) > { > QDict *rsp; > gchar *cmd; > + char *expected; > + int64_t result_int; > > cmd = g_strdup_printf("{ 'execute': 'migrate_set_downtime'," > - "'arguments': { 'value': %s } }", value); > + "'arguments': { 'value': %g } }", 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) > @@ -378,6 +398,7 @@ static void migrate_set_speed(QTestState *who, const char *value) > g_free(cmd); > g_assert(qdict_haskey(rsp, "return")); > QDECREF(rsp); > + migrate_check_parameter(who, "max-bandwidth", value); > } > > static void migrate_set_capability(QTestState *who, const char *capability, > @@ -509,7 +530,7 @@ static void test_migrate(void) > * machine, so also set the downtime. > */ > migrate_set_speed(from, "100000000"); > - migrate_set_downtime(from, "0.001"); > + migrate_set_downtime(from, 0.001); > > /* Wait for the first serial output from the source */ > wait_for_serial("src_serial"); > -- > 2.13.6 > -- Peter Xu