Another fix

Author: josesimoes

Tests/SocketTests/SocketRoundTripTests.cs

@@ -188,26 +188,32 @@ public void RoundTrip_Tcp_McuAsServer_CompanionConnects()
             server.Bind(new IPEndPoint(IPAddress.Any, mcuListenPort));
             server.Listen(1);
 
-            using (var companion = new CompanionClient())
+            try
             {
-                Assert.IsTrue(companion.Ping(), "Companion not reachable");
-
-                // Resolve the MCU's own IP - the companion must connect back to it.
-                string mcuIp = GetLocalIp();
-                Assert.IsTrue(companion.ConnectTo(mcuIp, mcuListenPort), "ConnectTo command failed");
+                using (var companion = new CompanionClient())
+                {
+                    Assert.IsTrue(companion.Ping(), "Companion not reachable");
 
-                // ConnectTo is synchronous on the companion side: by the time we get ok,
-                // the connection is already sitting in the listen backlog.
-                // Poll with 10 s timeout (microseconds) to avoid blocking forever.
-                Assert.IsTrue(server.Poll(10 * 1000 * 1000, SelectMode.SelectRead), "No connection received from companion within timeout");
-                Socket accepted = server.Accept();
+                    string mcuIp = GetLocalIp();
+                    Assert.IsTrue(companion.ConnectTo(mcuIp, mcuListenPort), "ConnectTo command failed");
 
-                Assert.IsNotNull(accepted, "Accept returned null");
+                    Assert.IsTrue(server.Poll(10 * 1000 * 1000, SelectMode.SelectRead), "No connection received from companion within timeout");
+                    Socket accepted = server.Accept();
 
-                accepted.Close();
+                    try
+                    {
+                        Assert.IsNotNull(accepted, "Accept returned null");
+                    }
+                    finally
+                    {
+                        accepted.Close();
+                    }
+                }
+            }
+            finally
+            {
+                server.Close();
             }
-
-            server.Close();
         }
 
         private static string GetLocalIp()