From 1f399897d219f2a55e581c44a829d0842514eacb Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Thu, 20 Oct 2022 17:01:20 +0200 Subject: [PATCH 1/1] Fix TCPClientServerTest stability Client's toString() changes when the connection completes. Move the check to after we have waited for callbacks. JIRA: NETCONF-590 Change-Id: I1ad7e375ca60d350affd1b226fa11ffc87106fe6 Signed-off-by: Robert Varga --- .../netconf/transport/tcp/TCPClientServerTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java b/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java index 54767e6943..3272b66afb 100644 --- a/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java +++ b/transport/transport-tcp/src/test/java/org/opendaylight/netconf/transport/tcp/TCPClientServerTest.java @@ -103,10 +103,6 @@ public class TCPClientServerTest { final var client = TCPClient.connect(clientListener, NettyTransportSupport.newBootstrap().group(group), clientGrouping).get(2, TimeUnit.SECONDS); try { - assertThat(client.toString(), allOf( - startsWith("TCPClient{listener=clientListener, state=TCPTransportChannel{channel=[id: 0x"), - endsWith(":" + serverPort.getValue() + "]}}"))); - verify(serverListener, timeout(500)).onTransportChannelEstablished(any()); final var serverTransports = serverCaptor.getAllValues(); assertEquals(1, serverTransports.size()); @@ -120,6 +116,10 @@ public class TCPClientServerTest { assertThat(clientTransports.get(0).toString(), allOf( startsWith("TCPTransportChannel{channel=[id: "), endsWith(":" + serverPort.getValue() + "]}"))); + + assertThat(client.toString(), allOf( + startsWith("TCPClient{listener=clientListener, state=TCPTransportChannel{channel=[id: 0x"), + endsWith(":" + serverPort.getValue() + "]}}"))); } finally { client.shutdown().get(2, TimeUnit.SECONDS); } -- 2.36.6