diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2018-08-23 16:31:24 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-10-02 19:09:12 +0200 |
| commit | 1ef64f1482c1f0df142eb7e4ab41bfe90ad1e65b (patch) | |
| tree | 1d2780930f8363dff6dd080aa82087a2c9a77a13 /tests/test-char.c | |
| parent | dfe9ea200ab1ba941149e90a6b3d220afc2dcc4c (diff) | |
| download | qemu-1ef64f1482c1f0df142eb7e4ab41bfe90ad1e65b.zip qemu-1ef64f1482c1f0df142eb7e4ab41bfe90ad1e65b.tar.gz qemu-1ef64f1482c1f0df142eb7e4ab41bfe90ad1e65b.tar.bz2 | |
test-char: fix random socket test failure
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.lureau@redhat.com>
Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20180823143125.16767-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'tests/test-char.c')
| -rw-r--r-- | tests/test-char.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/test-char.c b/tests/test-char.c index 2a2ff32..431577a 100644 --- a/tests/test-char.c +++ b/tests/test-char.c @@ -347,6 +347,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)); @@ -356,6 +362,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(); |