From fcc8108e9e83ceecfdd3d38db3b0b4c2d3ac7077 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6llner?= <christian.koellner.80@gmail.com>
Date: Sun, 19 Apr 2020 22:08:10 +0200
Subject: [PATCH] made tcp server handling in tests more robust

---
 Capnp.Net.Runtime.Tests/TcpRpc.cs        | 64 +++++++++++-------------
 Capnp.Net.Runtime.Tests/Util/TestBase.cs |  6 ++-
 2 files changed, 32 insertions(+), 38 deletions(-)

diff --git a/Capnp.Net.Runtime.Tests/TcpRpc.cs b/Capnp.Net.Runtime.Tests/TcpRpc.cs
index 0a99b2e..1285b09 100644
--- a/Capnp.Net.Runtime.Tests/TcpRpc.cs
+++ b/Capnp.Net.Runtime.Tests/TcpRpc.cs
@@ -16,38 +16,9 @@ namespace Capnp.Net.Runtime.Tests
 
     [TestClass]
     [TestCategory("Coverage")]
-    public class TcpRpc
+    public class TcpRpc: TestBase
     {
-        public static int TcpPort = 49153;
-
-        (TcpRpcServer, TcpRpcClient) SetupClientServerPair()
-        {
-            var server = new TcpRpcServer(IPAddress.Any, TcpPort);
-            var client = new TcpRpcClient("localhost", TcpPort);
-            return (server, client);
-        }
-
-        bool ExpectingLogOutput { get; set; }
-
-        [TestInitialize]
-        public void InitConsoleLogging()
-        {
-            ExpectingLogOutput = true;
-
-            Logging.LoggerFactory?.Dispose();
-#pragma warning disable CS0618 // Typ oder Element ist veraltet
-            Logging.LoggerFactory = new LoggerFactory().AddConsole((msg, level) =>
-            {
-                if (!ExpectingLogOutput && level != LogLevel.Debug)
-                {
-                    Assert.Fail("Did not expect any logging output, but got this: " + msg);
-                }
-                return true;
-            });
-#pragma warning restore CS0618 // Typ oder Element ist veraltet
-        }
-
-        int MediumNonDbgTimeout => Debugger.IsAttached ? Timeout.Infinite : 2000;
+        bool ExpectingLogOutput { get; set; } = true;
 
         [TestMethod]
         public void CreateAndDispose()
@@ -720,9 +691,30 @@ namespace Capnp.Net.Runtime.Tests
             }
         }
 
+        static void RobustStartAccepting(TcpRpcServer server)
+        {
+            int retry = 0;
+
+            do
+            {
+                try
+                {
+                    server.StartAccepting(IPAddress.Any, TcpPort);
+                    break;
+                }
+                catch (SocketException)
+                {
+                    if (retry++ == 100)
+                        throw;
+
+                    IncrementTcpPort();
+                }
+            } while (true);
+        }
+
         [TestMethod]
         public void Server1()
-        {
+        {            
             var cbb = new BufferBlock<IConnection>();
             var server = new TcpRpcServer();
             server.Main = new TestInterfaceImpl2();
@@ -757,7 +749,7 @@ namespace Capnp.Net.Runtime.Tests
 
             Assert.ThrowsException<InvalidOperationException>(() => server.StopListening());
 
-            server.StartAccepting(IPAddress.Any, TcpPort);
+            RobustStartAccepting(server);
             Assert.IsTrue(server.IsAlive);
             Assert.ThrowsException<InvalidOperationException>(() => server.StartAccepting(IPAddress.Any, TcpPort));
 
@@ -822,7 +814,7 @@ namespace Capnp.Net.Runtime.Tests
                 server.Dispose();
             };
 
-            server.StartAccepting(IPAddress.Any, TcpPort);
+            RobustStartAccepting(server);
 
             var client1 = new TcpRpcClient("localhost", TcpPort);
             Assert.IsTrue(client1.WhenConnected.Wait(MediumNonDbgTimeout), "Did not connect");
@@ -842,7 +834,7 @@ namespace Capnp.Net.Runtime.Tests
                     a.Connection.Close();
                 };
 
-                server.StartAccepting(IPAddress.Any, TcpPort);
+                RobustStartAccepting(server);
 
                 var client1 = new TcpRpcClient("localhost", TcpPort);
                 Assert.IsTrue(client1.WhenConnected.Wait(MediumNonDbgTimeout));
@@ -863,7 +855,7 @@ namespace Capnp.Net.Runtime.Tests
                 Assert.ThrowsException<InvalidOperationException>(() => client.GetMain<ITestInterface>());
                 Assert.ThrowsException<ArgumentNullException>(() => client.AttachTracer(null));
                 Assert.ThrowsException<ArgumentNullException>(() => client.InjectMidlayer(null));
-                server.StartAccepting(IPAddress.Any, TcpPort);
+                RobustStartAccepting(server);
                 client.Connect("localhost", TcpPort);
                 Assert.ThrowsException<InvalidOperationException>(() => client.Connect("localhost", TcpPort));
                 Assert.IsTrue(client.WhenConnected.Wait(MediumNonDbgTimeout));
diff --git a/Capnp.Net.Runtime.Tests/Util/TestBase.cs b/Capnp.Net.Runtime.Tests/Util/TestBase.cs
index 61d68ad..13a93bb 100644
--- a/Capnp.Net.Runtime.Tests/Util/TestBase.cs
+++ b/Capnp.Net.Runtime.Tests/Util/TestBase.cs
@@ -359,7 +359,8 @@ namespace Capnp.Net.Runtime.Tests
                 client.AttachTracer(new FrameTracing.RpcFrameTracer(Console.Out, false));
             if (options.HasFlag(TcpRpcTestOptions.ClientFluctStream))
                 client.InjectMidlayer(s => new FluctStream(s));
-            client.Connect("localhost", TcpPort);
+            if (!options.HasFlag(TcpRpcTestOptions.ClientNoConnect))
+                client.Connect("localhost", TcpPort);
             return client;
         }
 
@@ -368,7 +369,8 @@ namespace Capnp.Net.Runtime.Tests
         {
             None = 0,
             ClientTracer = 1,
-            ClientFluctStream = 2
+            ClientFluctStream = 2,
+            ClientNoConnect = 4
         }
 
         protected static TcpRpcServer SetupServer()