From 37e153fe45020c38229a113adc1eda05757e2c37 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 2 Oct 2014 16:51:34 +0200 Subject: blockdev-test: Simplify by using g_assert_cmpstr() 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(-) (limited to 'tests') diff --git a/tests/drive_del-test.c b/tests/drive_del-test.c index 32516a251c..80917ad86b 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(); -- cgit v1.2.1