From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50960) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XaVtf-0006MG-PS for qemu-devel@nongnu.org; Sat, 04 Oct 2014 16:25:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XaVtZ-0004lj-Ks for qemu-devel@nongnu.org; Sat, 04 Oct 2014 16:25:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45320) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XaVtZ-0004lb-4F for qemu-devel@nongnu.org; Sat, 04 Oct 2014 16:25:37 -0400 From: Stefan Hajnoczi Date: Sat, 4 Oct 2014 21:24:47 +0100 Message-Id: <1412454289-1789-22-git-send-email-stefanha@redhat.com> In-Reply-To: <1412454289-1789-1-git-send-email-stefanha@redhat.com> References: <1412454289-1789-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmpstr() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Peter Maydell From: Markus Armbruster Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake Message-id: 1412261496-24455-5-git-send-email-armbru@redhat.com Signed-off-by: Stefan Hajnoczi --- tests/drive_del-test.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 32516a2..80917ad 100644 --- a/tests/drive_del-test.c +++ b/tests/drive_del-test.c @@ -17,7 +17,6 @@ static void test_drive_without_dev(void) { QDict *response; - const char *response_return; /* Start with an empty drive */ qtest_start("-drive if=none,id=drive0"); @@ -28,9 +27,7 @@ static void test_drive_without_dev(void) " '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); + g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, ""); QDECREF(response); /* Ensure re-adding the drive works - there should be no duplicate ID error @@ -41,9 +38,7 @@ static void test_drive_without_dev(void) " '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); + g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n"); QDECREF(response); qtest_end(); -- 1.9.3