From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40382) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjO-0004xx-3a for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZhjH-0003TX-Ub for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:46 -0400 Received: from mx1.redhat.com ([209.132.183.28]:11339) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZhjH-0003TJ-Ol for qemu-devel@nongnu.org; Thu, 02 Oct 2014 10:51:39 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s92EpdGk006763 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Thu, 2 Oct 2014 10:51:39 -0400 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:34 +0200 Message-Id: <1412261496-24455-5-git-send-email-armbru@redhat.com> In-Reply-To: <1412261496-24455-1-git-send-email-armbru@redhat.com> References: <1412261496-24455-1-git-send-email-armbru@redhat.com> Subject: [Qemu-devel] [PATCH 4/6] 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: kwolf@redhat.com, stefanha@redhat.com Signed-off-by: Markus Armbruster --- 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 67309fd..2baf0b7 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