From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33075) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHYDg-0001pi-Hr for qemu-devel@nongnu.org; Tue, 21 Jul 2015 10:08:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZHYDf-0006Kl-I0 for qemu-devel@nongnu.org; Tue, 21 Jul 2015 10:08:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:58814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZHYDf-0006Kd-CR for qemu-devel@nongnu.org; Tue, 21 Jul 2015 10:08:31 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 24DAEB5C07 for ; Tue, 21 Jul 2015 14:08:31 +0000 (UTC) From: Paolo Bonzini Date: Tue, 21 Jul 2015 16:07:49 +0200 Message-Id: <1437487673-23740-3-git-send-email-pbonzini@redhat.com> In-Reply-To: <1437487673-23740-1-git-send-email-pbonzini@redhat.com> References: <1437487673-23740-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH v4 2/6] tests: remove irrelevant assertions from test-aio List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, lersek@redhat.com, rjones@redhat.com, stefanha@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 --- 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