From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37588) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eZC2H-0007xo-GI for qemu-devel@nongnu.org; Wed, 10 Jan 2018 03:47:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eZC2E-000216-7f for qemu-devel@nongnu.org; Wed, 10 Jan 2018 03:47:01 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60766) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eZC2D-00020C-VP for qemu-devel@nongnu.org; Wed, 10 Jan 2018 03:46:58 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 03840356CA for ; Wed, 10 Jan 2018 08:46:57 +0000 (UTC) From: Juan Quintela In-Reply-To: <20180110063707.GD5984@xz-mi> (Peter Xu's message of "Wed, 10 Jan 2018 14:37:07 +0800") References: <20180105215246.908-1-quintela@redhat.com> <20180105215246.908-6-quintela@redhat.com> <20180110063707.GD5984@xz-mi> Reply-To: quintela@redhat.com Date: Wed, 10 Jan 2018 09:46:49 +0100 Message-ID: <87mv1myubq.fsf@secure.laptop> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v4 05/11] tests: Add deprecated commands migration test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, dgilbert@redhat.com, lvivier@redhat.com Peter Xu wrote: > On Fri, Jan 05, 2018 at 10:52:40PM +0100, Juan Quintela wrote: >> We add deprecated commands on a new test, so we don't have to add it >> on normal tests. >> >> Signed-off-by: Juan Quintela >> --- >> tests/migration-test.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++ >> 1 file changed, 59 insertions(+) >> >> diff --git a/tests/migration-test.c b/tests/migration-test.c >> index f469235d0b..bcb0a82d42 100644 >> --- a/tests/migration-test.c >> +++ b/tests/migration-test.c >> @@ -513,6 +513,64 @@ static void test_migrate_end(QTestState *from, QTestState *to) >> cleanup("dest_serial"); >> } >> >> +static void deprecated_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': %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 deprecated_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); >> +} >> + >> +static void test_deprecated(void) >> +{ >> + char *uri = g_strdup_printf("unix:%s/migsocket", tmpfs); >> + QTestState *from, *to; >> + >> + /* Create source and destination guests. This way we can reuse >> + * test_migrate_start */ >> + test_migrate_start(&from, &to, uri); >> + >> + deprecated_set_downtime(from, 0.12345); >> + deprecated_set_downtime(to, 0.12345); >> + deprecated_set_speed(from, "12345"); >> + deprecated_set_speed(to, "12345"); >> + >> + g_free(uri); >> + >> + qtest_quit(from); >> + qtest_quit(to); >> + >> + cleanup("bootsect"); >> + cleanup("migsocket"); >> + cleanup("src_serial"); >> + cleanup("dest_serial"); > > I thought calling qtest_start() with a single VM would be even > simpler, but this is good enough for me... Thanks for that. :-) I had two options: - reuse the test_migrate_start function, and create two guests - create a function that only creates one guest, but repeat the architecture dependent part. Take your poison. > Reviewed-by: Peter Xu Thanks, Juan.