tests: remove irrelevant assertions from test-aio
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> Reviewed-by: Fam Zheng <famz@redhat.com> Tested-by: Richard W.M. Jones <rjones@redhat.com> Message-id: 1437487673-23740-3-git-send-email-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
		
							parent
							
								
									e4efd8a488
								
							
						
					
					
						commit
						12d69ac03b
					
				@ -331,7 +331,7 @@ static void test_wait_event_notifier(void)
 | 
				
			|||||||
    EventNotifierTestData data = { .n = 0, .active = 1 };
 | 
					    EventNotifierTestData data = { .n = 0, .active = 1 };
 | 
				
			||||||
    event_notifier_init(&data.e, false);
 | 
					    event_notifier_init(&data.e, false);
 | 
				
			||||||
    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
 | 
					    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.n, ==, 0);
 | 
				
			||||||
    g_assert_cmpint(data.active, ==, 1);
 | 
					    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 };
 | 
					    EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
 | 
				
			||||||
    event_notifier_init(&data.e, false);
 | 
					    event_notifier_init(&data.e, false);
 | 
				
			||||||
    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
 | 
					    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.n, ==, 0);
 | 
				
			||||||
    g_assert_cmpint(data.active, ==, 10);
 | 
					    g_assert_cmpint(data.active, ==, 10);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -669,7 +669,7 @@ static void test_source_wait_event_notifier(void)
 | 
				
			|||||||
    EventNotifierTestData data = { .n = 0, .active = 1 };
 | 
					    EventNotifierTestData data = { .n = 0, .active = 1 };
 | 
				
			||||||
    event_notifier_init(&data.e, false);
 | 
					    event_notifier_init(&data.e, false);
 | 
				
			||||||
    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
 | 
					    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.n, ==, 0);
 | 
				
			||||||
    g_assert_cmpint(data.active, ==, 1);
 | 
					    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 };
 | 
					    EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
 | 
				
			||||||
    event_notifier_init(&data.e, false);
 | 
					    event_notifier_init(&data.e, false);
 | 
				
			||||||
    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
 | 
					    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.n, ==, 0);
 | 
				
			||||||
    g_assert_cmpint(data.active, ==, 10);
 | 
					    g_assert_cmpint(data.active, ==, 10);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user