From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, famz@redhat.com, lersek@redhat.com,
rjones@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH v4 2/6] tests: remove irrelevant assertions from test-aio
Date: Tue, 21 Jul 2015 16:07:49 +0200 [thread overview]
Message-ID: <1437487673-23740-3-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1437487673-23740-1-git-send-email-pbonzini@redhat.com>
In these tests, the purpose of the initial calls to aio_poll and
g_main_context_iteration is simply to put the AioContext in a
known state; the return value of the function does not really
matter. The next patch will change those return values; change
the assertions to a while loop which expresses the intention
better.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
tests/test-aio.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/test-aio.c b/tests/test-aio.c
index a7cb5c9..e7bbb83 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -331,7 +331,7 @@ static void test_wait_event_notifier(void)
EventNotifierTestData data = { .n = 0, .active = 1 };
event_notifier_init(&data.e, false);
aio_set_event_notifier(ctx, &data.e, event_ready_cb);
- g_assert(!aio_poll(ctx, false));
+ while (aio_poll(ctx, false));
g_assert_cmpint(data.n, ==, 0);
g_assert_cmpint(data.active, ==, 1);
@@ -356,7 +356,7 @@ static void test_flush_event_notifier(void)
EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
event_notifier_init(&data.e, false);
aio_set_event_notifier(ctx, &data.e, event_ready_cb);
- g_assert(!aio_poll(ctx, false));
+ while (aio_poll(ctx, false));
g_assert_cmpint(data.n, ==, 0);
g_assert_cmpint(data.active, ==, 10);
@@ -669,7 +669,7 @@ static void test_source_wait_event_notifier(void)
EventNotifierTestData data = { .n = 0, .active = 1 };
event_notifier_init(&data.e, false);
aio_set_event_notifier(ctx, &data.e, event_ready_cb);
- g_assert(g_main_context_iteration(NULL, false));
+ while (g_main_context_iteration(NULL, false));
g_assert_cmpint(data.n, ==, 0);
g_assert_cmpint(data.active, ==, 1);
@@ -694,7 +694,7 @@ static void test_source_flush_event_notifier(void)
EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
event_notifier_init(&data.e, false);
aio_set_event_notifier(ctx, &data.e, event_ready_cb);
- g_assert(g_main_context_iteration(NULL, false));
+ while (g_main_context_iteration(NULL, false));
g_assert_cmpint(data.n, ==, 0);
g_assert_cmpint(data.active, ==, 10);
--
2.4.3
next prev parent reply other threads:[~2015-07-21 14:08 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-21 14:07 [Qemu-devel] [PATCH v4 0/6] AioContext: ctx->dispatching is dead, all hail ctx->notify_me Paolo Bonzini
2015-07-21 14:07 ` [Qemu-devel] [PATCH v4 1/6] qemu-timer: initialize "timers_done_ev" to set Paolo Bonzini
2015-07-21 14:07 ` Paolo Bonzini [this message]
2015-07-21 14:07 ` [Qemu-devel] [PATCH v4 3/6] aio-win32: reorganize polling loop Paolo Bonzini
2015-07-21 14:07 ` [Qemu-devel] [PATCH v4 4/6] AioContext: fix broken ctx->dispatching optimization Paolo Bonzini
2015-07-21 14:07 ` [Qemu-devel] [PATCH v4 5/6] AioContext: fix broken placement of event_notifier_test_and_clear Paolo Bonzini
2015-07-21 14:07 ` [Qemu-devel] [PATCH v4 6/6] AioContext: optimize clearing the EventNotifier Paolo Bonzini
2015-07-22 2:23 ` [Qemu-devel] [PATCH v4 0/6] AioContext: ctx->dispatching is dead, all hail ctx->notify_me Fam Zheng
2015-07-22 9:41 ` Richard W.M. Jones
2015-07-22 11:39 ` 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=1437487673-23740-3-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=famz@redhat.com \
--cc=kwolf@redhat.com \
--cc=lersek@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=rjones@redhat.com \
--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).