From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51698) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvjI-0004k4-I8 for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WCvjA-0005pu-GX for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:16 -0500 Received: from cantor2.suse.de ([195.135.220.15]:47144 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WCvj9-0005p6-Tu for qemu-devel@nongnu.org; Mon, 10 Feb 2014 13:37:08 -0500 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Mon, 10 Feb 2014 19:36:23 +0100 Message-Id: <1392057426-31990-7-git-send-email-afaerber@suse.de> In-Reply-To: <1392057426-31990-1-git-send-email-afaerber@suse.de> References: <1392057426-31990-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 06/48] 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: Markus Armbruster , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: Markus Armbruster Signed-off-by: Markus Armbruster Signed-off-by: Andreas F=C3=A4rber --- 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 24cb9c5..3316a11 100644 --- a/tests/qom-test.c +++ b/tests/qom-test.c @@ -42,17 +42,17 @@ static bool is_blacklisted(const char *arch, const ch= ar *mach) return false; } =20 -static void test_nop(gconstpointer data) +static void test_machine(gconstpointer data) { - QTestState *s; const char *machine =3D data; char *args; + QDict *response; =20 args =3D g_strdup_printf("-machine %s", machine); - s =3D qtest_start(args); - if (s) { - qtest_quit(s); - } + qtest_start(args); + response =3D qmp("{ 'execute': 'quit' }"); + g_assert(qdict_haskey(response, "return")); + qtest_end(); g_free(args); } =20 @@ -82,7 +82,7 @@ static void add_machine_test_cases(void) mname =3D qstring_get_str(qstr); if (!is_blacklisted(arch, mname)) { path =3D 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(); --=20 1.8.4.5