From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39753) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsqek-0001fb-N2 for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:32:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsqeh-0004O0-9E for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:32:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:36142 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fsqeh-0004NG-20 for qemu-devel@nongnu.org; Thu, 23 Aug 2018 10:32:11 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AE0DE7A7E7 for ; Thu, 23 Aug 2018 14:32:10 +0000 (UTC) From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Thu, 23 Aug 2018 16:31:25 +0200 Message-Id: <20180823143125.16767-6-marcandre.lureau@redhat.com> In-Reply-To: <20180823143125.16767-1-marcandre.lureau@redhat.com> References: <20180823143125.16767-1-marcandre.lureau@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v2 5/5] test-char: add socket reconnect test List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , berrange@redhat.com, peterx@redhat.com, =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= This test exhibits a regression fixed by the previous reverts. Signed-off-by: Marc-Andr=C3=A9 Lureau --- 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; } =20 -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 =3D object_property_get_qobject(OBJECT(chr), "addr", &error_abo= rt); qdict =3D qobject_to(QDict, addr); port =3D qdict_get_str(qdict, "port"); - tmp =3D g_strdup_printf("tcp:127.0.0.1:%s", port); + tmp =3D g_strdup_printf("tcp:127.0.0.1:%s%s", port, + reconnect ? ",reconnect=3D1" : ""); qobject_unref(qdict); =20 qemu_chr_fe_init(&be, chr, &error_abort); @@ -377,7 +378,15 @@ static void char_socket_basic_test(void) { Chardev *chr =3D qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowa= it"); =20 - char_socket_test_common(chr); + char_socket_test_common(chr, false); +} + + +static void char_socket_reconnect_test(void) +{ + Chardev *chr =3D qemu_chr_new("server", "tcp:127.0.0.1:0,server,nowa= it"); + + char_socket_test_common(chr, true); } =20 =20 @@ -409,7 +418,7 @@ static void char_socket_fdpass_test(void) =20 qemu_opts_del(opts); =20 - char_socket_test_common(chr); + char_socket_test_common(chr, false); } =20 =20 @@ -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 --=20 2.18.0.547.g1d89318c48