[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test |
Date: |
Thu, 23 Aug 2018 16:31:25 +0200 |
This test exhibits a regression fixed by the previous reverts.
Signed-off-by: Marc-André Lureau <address@hidden>
---
tests/test-char.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/tests/test-char.c b/tests/test-char.c
index 2b1e400542..68a82a0d93 100644
--- a/tests/test-char.c
+++ b/tests/test-char.c
@@ -309,7 +309,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;
@@ -329,7 +329,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);
@@ -377,7 +378,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);
}
@@ -409,7 +418,7 @@ static void char_socket_fdpass_test(void)
qemu_opts_del(opts);
- char_socket_test_common(chr);
+ char_socket_test_common(chr, false);
}
@@ -830,6 +839,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
--
2.18.0.547.g1d89318c48
- [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 1/5] Revert "chardev: tcp: postpone TLS work until machine done", Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 2/5] Revert "chardev: tcp: postpone async connection setup", Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 3/5] char-socket: update all ioc handlers when changing context, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 4/5] test-char: fix random socket test failure, Marc-André Lureau, 2018/08/23
- [Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test,
Marc-André Lureau <=
- Re: [Qemu-devel] [PATCH v2 0/5] Fix socket chardev regression, Peter Xu, 2018/08/23