From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38981) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsQUg-00016R-5P for qemu-devel@nongnu.org; Thu, 05 Jun 2014 01:45:48 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WsQUZ-00051M-Tq for qemu-devel@nongnu.org; Thu, 05 Jun 2014 01:45:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57758) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WsQUZ-00051B-GW for qemu-devel@nongnu.org; Thu, 05 Jun 2014 01:45:35 -0400 From: Amos Kong Date: Thu, 5 Jun 2014 13:45:18 +0800 Message-Id: <1401947118-19973-5-git-send-email-akong@redhat.com> In-Reply-To: <1401947118-19973-1-git-send-email-akong@redhat.com> References: <1401947118-19973-1-git-send-email-akong@redhat.com> Subject: [Qemu-devel] [PATCH v2 4/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: stefanha@gmail.com, afaerber@suse.de, mst@redhat.com Signed-off-by: Amos Kong --- 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..a84345c 100644 --- a/tests/blockdev-test.c +++ b/tests/blockdev-test.c @@ -16,35 +16,16 @@ static void test_drive_add_empty(void) { - QDict *response; - const char *response_return; - /* Start with an empty drive */ qtest_start("-drive if=none,id=drive0"); /* Delete the drive */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_del drive0\"" - "}}"); - g_assert(response); - response_return = qdict_get_try_str(response, "return"); - g_assert(response_return); - g_assert(strcmp(response_return, "") == 0); - QDECREF(response); + qmp_exec_hmp_cmd("drive_del drive0", ""); /* Ensure re-adding the drive works - there should be no duplicate ID error * because the old drive must be gone. */ - response = qmp("{\"execute\": \"human-monitor-command\"," - " \"arguments\": {" - " \"command-line\": \"drive_add 0 if=none,id=drive0\"" - "}}"); - g_assert(response); - response_return = qdict_get_try_str(response, "return"); - g_assert(response_return); - g_assert(strcmp(response_return, "OK\r\n") == 0); - QDECREF(response); + qmp_exec_hmp_cmd("drive_add 0 if=none,id=drive0", "OK\r\n"); qtest_end(); } -- 1.9.3