qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Daniel P. Berrange" <berrange@redhat.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>
Subject: [Qemu-devel] [PULL v1 07/18] io: assert errors before asserting content in I/O test
Date: Fri, 11 Mar 2016 10:03:57 +0000	[thread overview]
Message-ID: <1457690648-19267-8-git-send-email-berrange@redhat.com> (raw)
In-Reply-To: <1457690648-19267-1-git-send-email-berrange@redhat.com>

When checking the results of an I/O operation test, assert that
the error objects are NULL before asserting on the content. This
is found to give more useful indication of the problem when
diagnosing test failures.

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
---
 tests/io-channel-helpers.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c
index d513792..a4dedbe 100644
--- a/tests/io-channel-helpers.c
+++ b/tests/io-channel-helpers.c
@@ -233,11 +233,11 @@ void qio_channel_test_run_reader(QIOChannelTest *test,
 
 void qio_channel_test_validate(QIOChannelTest *test)
 {
+    g_assert(test->readerr == NULL);
+    g_assert(test->writeerr == NULL);
     g_assert_cmpint(memcmp(test->input,
                            test->output,
                            test->len), ==, 0);
-    g_assert(test->readerr == NULL);
-    g_assert(test->writeerr == NULL);
 
     g_free(test->inputv);
     g_free(test->outputv);
-- 
2.5.0

  parent reply	other threads:[~2016-03-11 10:04 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-11 10:03 [Qemu-devel] [PULL v1 00/18] Merge I/O channel fixes for Win32 Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 01/18] osdep: fix socket_error() to work with Mingw64 Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 02/18] io: use bind() to check for IPv4/6 availability Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 03/18] io: initialize sockets in test program Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 04/18] io: bind to socket before creating QIOChannelSocket Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 05/18] io: wait for incoming client in socket test Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 06/18] io: set correct error object in background reader test thread Daniel P. Berrange
2016-03-11 10:03 ` Daniel P. Berrange [this message]
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 08/18] io: fix copy+paste mistake in socket error message Daniel P. Berrange
2016-03-11 10:03 ` [Qemu-devel] [PULL v1 09/18] io: pass HANDLE to g_source_add_poll on Win32 Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 10/18] io: introduce qio_channel_create_socket_watch Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 11/18] io: use qemu_accept to ensure SOCK_CLOEXEC is set Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 12/18] io: remove checking of EWOULDBLOCK Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 13/18] io: implement socket watch for win32 using WSAEventSelect+select Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 14/18] char: remove qemu_chr_finish_socket_connection method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 15/18] char: remove socket_try_connect method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 16/18] char: remove qemu_chr_open_socket_fd method Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 17/18] osdep: add wrappers for socket functions Daniel P. Berrange
2016-03-11 10:04 ` [Qemu-devel] [PULL v1 18/18] osdep: remove use of socket_error() from all code Daniel P. Berrange
2016-03-14 13:50 ` [Qemu-devel] [PULL v1 00/18] Merge I/O channel fixes for Win32 Peter Maydell

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=1457690648-19267-8-git-send-email-berrange@redhat.com \
    --to=berrange@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    /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).