blockdev-test: Simplify by using g_assert_cmpstr()
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-id: 1412261496-24455-5-git-send-email-armbru@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
parent
e319df669d
commit
37e153fe45
|
@ -17,7 +17,6 @@
|
||||||
static void test_drive_without_dev(void)
|
static void test_drive_without_dev(void)
|
||||||
{
|
{
|
||||||
QDict *response;
|
QDict *response;
|
||||||
const char *response_return;
|
|
||||||
|
|
||||||
/* Start with an empty drive */
|
/* Start with an empty drive */
|
||||||
qtest_start("-drive if=none,id=drive0");
|
qtest_start("-drive if=none,id=drive0");
|
||||||
|
@ -28,9 +27,7 @@ static void test_drive_without_dev(void)
|
||||||
" 'command-line': 'drive_del drive0'"
|
" 'command-line': 'drive_del drive0'"
|
||||||
"}}");
|
"}}");
|
||||||
g_assert(response);
|
g_assert(response);
|
||||||
response_return = qdict_get_try_str(response, "return");
|
g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "");
|
||||||
g_assert(response_return);
|
|
||||||
g_assert(strcmp(response_return, "") == 0);
|
|
||||||
QDECREF(response);
|
QDECREF(response);
|
||||||
|
|
||||||
/* Ensure re-adding the drive works - there should be no duplicate ID error
|
/* 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'"
|
" 'command-line': 'drive_add 0 if=none,id=drive0'"
|
||||||
"}}");
|
"}}");
|
||||||
g_assert(response);
|
g_assert(response);
|
||||||
response_return = qdict_get_try_str(response, "return");
|
g_assert_cmpstr(qdict_get_try_str(response, "return"), ==, "OK\r\n");
|
||||||
g_assert(response_return);
|
|
||||||
g_assert(strcmp(response_return, "OK\r\n") == 0);
|
|
||||||
QDECREF(response);
|
QDECREF(response);
|
||||||
|
|
||||||
qtest_end();
|
qtest_end();
|
||||||
|
|
Loading…
Reference in New Issue