qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 4/6] blockdev-test: Simplify by using g_assert_cmpstr()
Date: Thu,  2 Oct 2014 16:51:34 +0200	[thread overview]
Message-ID: <1412261496-24455-5-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1412261496-24455-1-git-send-email-armbru@redhat.com>

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 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

  parent reply	other threads:[~2014-10-02 14:51 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-02 14:51 [Qemu-devel] [PATCH 0/6] Improve drive_del test coverage Markus Armbruster
2014-10-02 14:51 ` [Qemu-devel] [PATCH 1/6] drive_del-test: Merge of qdev-monitor-test, blockdev-test Markus Armbruster
2014-10-02 15:26   ` Eric Blake
2014-10-02 16:20     ` Markus Armbruster
2014-10-02 14:51 ` [Qemu-devel] [PATCH 2/6] blockdev-test: Use single rather than double quotes in QMP Markus Armbruster
2014-10-02 15:24   ` Eric Blake
2014-10-02 16:24     ` Markus Armbruster
2014-10-02 14:51 ` [Qemu-devel] [PATCH 3/6] blockdev-test: Clean up bogus drive_add argument Markus Armbruster
2014-10-02 15:27   ` Eric Blake
2014-10-02 14:51 ` Markus Armbruster [this message]
2014-10-02 15:31   ` [Qemu-devel] [PATCH 4/6] blockdev-test: Simplify by using g_assert_cmpstr() Eric Blake
2014-10-02 14:51 ` [Qemu-devel] [PATCH 5/6] blockdev-test: Factor out some common code into helpers Markus Armbruster
2014-10-02 15:35   ` Eric Blake
2014-10-02 14:51 ` [Qemu-devel] [PATCH 6/6] blockdev-test: Test device_del after drive_del Markus Armbruster
2014-10-02 15:38   ` Eric Blake
2014-10-02 16:25     ` Markus Armbruster
2014-10-04 18:35 ` [Qemu-devel] [PATCH 0/6] Improve drive_del test coverage Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1412261496-24455-5-git-send-email-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).