Skip to content

Commit

Permalink
test-char: add socket reconnect test
Browse files Browse the repository at this point in the history
This test exhibits a regression fixed by the previous reverts.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20180817135224.22971-5-marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
  • Loading branch information
elmarco authored and bonzini committed Oct 2, 2018
1 parent 1ef64f1 commit 5b9d17b
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions tests/test-char.c
Expand Up @@ -307,7 +307,7 @@ static int socket_can_read_hello(void *opaque)
return 10;
}

static void char_socket_test_common(Chardev *chr)
static void char_socket_test_common(Chardev *chr, bool reconnect)
{
Chardev *chr_client;
QObject *addr;
Expand All @@ -327,7 +327,8 @@ static void char_socket_test_common(Chardev *chr)
addr = object_property_get_qobject(OBJECT(chr), "addr", &error_abort);
qdict = qobject_to(QDict, addr);
port = qdict_get_str(qdict, "port");
tmp = g_strdup_printf("tcp:127.0.0.1:%s", port);
tmp = g_strdup_printf("tcp:127.0.0.1:%s%s", port,
reconnect ? ",reconnect=1" : "");
qobject_unref(qdict);

qemu_chr_fe_init(&be, chr, &error_abort);
Expand Down Expand Up @@ -375,7 +376,15 @@ static void char_socket_basic_test(void)
{
Chardev *chr = qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowait");

char_socket_test_common(chr);
char_socket_test_common(chr, false);
}


static void char_socket_reconnect_test(void)
{
Chardev *chr = qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowait");

char_socket_test_common(chr, true);
}


Expand Down Expand Up @@ -407,7 +416,7 @@ static void char_socket_fdpass_test(void)

qemu_opts_del(opts);

char_socket_test_common(chr);
char_socket_test_common(chr, false);
}


Expand Down Expand Up @@ -826,6 +835,7 @@ int main(int argc, char **argv)
g_test_add_func("/char/file-fifo", char_file_fifo_test);
#endif
g_test_add_func("/char/socket/basic", char_socket_basic_test);
g_test_add_func("/char/socket/reconnect", char_socket_reconnect_test);
g_test_add_func("/char/socket/fdpass", char_socket_fdpass_test);
g_test_add_func("/char/udp", char_udp_test);
#ifdef HAVE_CHARDEV_SERIAL
Expand Down

0 comments on commit 5b9d17b

Please sign in to comment.