[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmps
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmpstr() |
Date: |
Sat, 4 Oct 2014 21:24:47 +0100 |
From: Markus Armbruster <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
- [Qemu-devel] [PULL 12/23] qtest/bios-tables: Correct Q35 command line, (continued)
- [Qemu-devel] [PULL 12/23] qtest/bios-tables: Correct Q35 command line, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 10/23] pc/vl: Add units-per-default-bus property, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 13/23] q35/ahci: Pick up -cdrom and -hda options, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 14/23] util: Emancipate id_wellformed() from QemuOpts, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 15/23] iotests: Use _img_info, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 17/23] iotests: qemu-img info output for corrupt image, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 16/23] qapi: Add corrupt field to ImageInfoSpecificQCow2, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 18/23] drive_del-test: Merge of qdev-monitor-test, blockdev-test, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 19/23] blockdev-test: Use single rather than double quotes in QMP, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 20/23] blockdev-test: Clean up bogus drive_add argument, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 21/23] blockdev-test: Simplify by using g_assert_cmpstr(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 22/23] blockdev-test: Factor out some common code into helpers, Stefan Hajnoczi, 2014/10/04
- [Qemu-devel] [PULL 23/23] blockdev-test: Test device_del after drive_del, Stefan Hajnoczi, 2014/10/04
- Re: [Qemu-devel] [PULL 00/23] Block patches, Peter Maydell, 2014/10/06