From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37411) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIf3-0000s7-NG for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:39 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxIex-00021p-Vd for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:33 -0400 Received: from mx1.redhat.com ([209.132.183.28]:25462) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxIex-00021h-Mp for qemu-devel@nongnu.org; Wed, 18 Jun 2014 12:24:27 -0400 From: Amos Kong Date: Thu, 19 Jun 2014 00:24:11 +0800 Message-Id: <1403108653-26765-3-git-send-email-akong@redhat.com> In-Reply-To: <1403108653-26765-1-git-send-email-akong@redhat.com> References: <1403108653-26765-1-git-send-email-akong@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v5 2/4] qtest: use qmp_exec_hmp_cmd() in blockdev-test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@gmail.com, arei.gonglei@huawei.com, afaerber@suse.de, pbonzini@redhat.com Signed-off-by: Amos Kong Reviewed-by: Stefan Hajnoczi Reviewed-by: Andreas F=C3=A4rber --- tests/blockdev-test.c | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/tests/blockdev-test.c b/tests/blockdev-test.c index c940e00..c9127c0 100644 --- a/tests/blockdev-test.c +++ b/tests/blockdev-test.c @@ -16,35 +16,16 @@ =20 static void test_drive_add_empty(void) { - QDict *response; - const char *response_return; - /* Start with an empty drive */ qtest_start("-drive if=3Dnone,id=3Ddrive0"); =20 /* Delete the drive */ - response =3D qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_del drive0\"" - "}}"); - g_assert(response); - response_return =3D qdict_get_try_str(response, "return"); - g_assert(response_return); - g_assert(strcmp(response_return, "") =3D=3D 0); - QDECREF(response); + qmp_exec_hmp_cmd("", "drive_del drive0"); =20 /* Ensure re-adding the drive works - there should be no duplicate I= D error * because the old drive must be gone. */ - response =3D qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_add 0 if=3Dnone,id=3Ddr= ive0\"" - "}}"); - g_assert(response); - response_return =3D qdict_get_try_str(response, "return"); - g_assert(response_return); - g_assert(strcmp(response_return, "OK\r\n") =3D=3D 0); - QDECREF(response); + qmp_exec_hmp_cmd("OK\r\n", "drive_add 0 if=3Dnone,id=3Ddrive0"); =20 qtest_end(); } --=20 1.9.3