Allow for a small marging when verifying whether configured timeout w…

…as respected.
sshnet · Dec 31, 2020 · 0085562 · 0085562
1 parent 41e378c
commit 0085562
Show file tree

Hide file tree

Showing 14 changed files with 37 additions and 23 deletions.
diff --git a/....SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs b/....SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs
@@ -77,7 +77,8 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs b/src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs
@@ -88,7 +88,8 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/....SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs b/....SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
@@ -81,8 +81,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs b/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -85,7 +85,8 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs b/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -88,8 +88,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...ci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs b/...ci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs
@@ -135,8 +135,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs b/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs
@@ -105,8 +105,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...i.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs b/...i.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -76,7 +76,8 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...i.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/...i.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -78,8 +78,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/....Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs b/....Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs
@@ -109,8 +109,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...ci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs b/...ci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs
@@ -105,8 +105,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs b/...SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs
@@ -97,8 +97,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...i.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs b/...i.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs
@@ -77,7 +77,8 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]

diff --git a/...i.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs b/...i.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
@@ -80,8 +80,9 @@ public void ConnectShouldHaveRespectedTimeout()
                                           _stopWatch.ElapsedMilliseconds,
                                           _connectionInfo.Timeout.TotalMilliseconds);
 
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
-            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
+            // Compare elapsed time with configured timeout, allowing for a margin of error
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
+            Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
         }
 
         [TestMethod]