On 23/08/2018 16:31, Marc-André Lureau wrote:
> Peter reported a test failure on FreeBSD with the new reconnect test:
>
> MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
> gtester -k --verbose -m=quick tests/test-char
> TEST: tests/test-char... (pid=16190)
> /char/null: OK
> /char/invalid: OK
> /char/ringbuf: OK
> /char/mux: OK
> /char/stdio: OK
> /char/pipe: OK
> /char/file: OK
> /char/file-fifo: OK
> /char/udp: OK
> /char/serial: OK
> /char/hotswap: OK
> /char/socket/basic: OK
> /char/socket/reconnect: FAIL
> GTester: last random seed: R02S521380d9c12f1dac3ad1763bf5665c27
> (pid=16367)
> /char/socket/fdpass: OK
> FAIL: tests/test-char
> **
> ERROR:tests/test-char.c:353:char_socket_test_common: assertion failed:
> (object_property_get_bool(OBJECT(chr_client), "connected",
> &error_abort))
>
> It turns out that the socket test code checks both server and client
> connection states, but doesn't wait for both.
>
> Wait for the client side as well.
>
> Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> tests/test-char.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tests/test-char.c b/tests/test-char.c
> index 5905d31441..2b1e400542 100644
> --- a/tests/test-char.c
> +++ b/tests/test-char.c
> @@ -349,6 +349,12 @@ static void char_socket_test_common(Chardev *chr)
> g_assert_cmpint(id, >, 0);
> main_loop();
>
> + d.chr = chr_client;
> + id = g_idle_add(char_socket_test_idle, &d);
> + g_source_set_name_by_id(id, "test-idle");
> + g_assert_cmpint(id, >, 0);
> + main_loop();
> +
> g_assert(object_property_get_bool(OBJECT(chr), "connected",
> &error_abort));
> g_assert(object_property_get_bool(OBJECT(chr_client),
> "connected", &error_abort));
> @@ -358,6 +364,7 @@ static void char_socket_test_common(Chardev *chr)
>
> object_unparent(OBJECT(chr_client));
>
> + d.chr = chr;
> d.conn_expected = false;
> g_idle_add(char_socket_test_idle, &d);
> main_loop();
>
Reviewed-by: Paolo Bonzini <pbonz...@redhat.com>
