From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60969) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1cBm-0001Ro-W3 for qemu-devel@nongnu.org; Fri, 10 Jan 2014 08:32:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1W1cBg-0006Ah-PX for qemu-devel@nongnu.org; Fri, 10 Jan 2014 08:31:54 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12511) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1W1cBg-0006AZ-H2 for qemu-devel@nongnu.org; Fri, 10 Jan 2014 08:31:48 -0500 From: armbru@redhat.com Date: Fri, 10 Jan 2014 14:31:39 +0100 Message-Id: <1389360699-9183-3-git-send-email-armbru@redhat.com> In-Reply-To: <1389360699-9183-1-git-send-email-armbru@redhat.com> References: <1389360699-9183-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] qom-test: Test shutdown in addition to startup List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: afaerber@suse.de From: Markus Armbruster Signed-off-by: Markus Armbruster --- tests/qom-test.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/qom-test.c b/tests/qom-test.c index 3cbd480..8f42716 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -48,17 +48,17 @@ static bool is_blacklisted(const char *arch, const char *mach) return false; } -static void test_nop(gconstpointer data) +static void test_machine(gconstpointer data) { - QTestState *s; const char *machine = data; char *args; + QDict *response; args = g_strdup_printf("-machine %s", machine); - s = qtest_start(args); - if (s) { - qtest_quit(s); - } + qtest_start(args); + response = qmp("{ 'execute': 'quit' }"); + g_assert(qdict_haskey(response, "return")); + qtest_end(); g_free(args); } @@ -88,7 +88,7 @@ static void add_machine_test_cases(void) mname = qstring_get_str(qstr); if (!is_blacklisted(arch, mname)) { path = g_strdup_printf("/%s/qom/%s", arch, mname); - g_test_add_data_func(path, mname, test_nop); + g_test_add_data_func(path, mname, test_machine); } } qtest_end(); -- 1.8.1.4