Skip to content

Commit 0085562

Browse files
driesengdrieseng
committed
Allow for a small marging when verifying whether configured timeout was respected.
1 parent 41e378c commit 0085562

14 files changed

+37
-23
lines changed

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionRefusedByServer.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public void ConnectShouldHaveRespectedTimeout()
7777
_stopWatch.ElapsedMilliseconds,
7878
_connectionInfo.Timeout.TotalMilliseconds);
7979

80-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
80+
// Compare elapsed time with configured timeout, allowing for a margin of error
81+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8182
}
8283

8384
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_ConnectionSucceeded.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public void ConnectShouldHaveRespectedTimeout()
8888
_stopWatch.ElapsedMilliseconds,
8989
_connectionInfo.Timeout.TotalMilliseconds);
9090

91-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
91+
// Compare elapsed time with configured timeout, allowing for a margin of error
92+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
9293
}
9394

9495
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,9 @@ public void ConnectShouldHaveRespectedTimeout()
8181
_stopWatch.ElapsedMilliseconds,
8282
_connectionInfo.Timeout.TotalMilliseconds);
8383

84-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
85-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
84+
// Compare elapsed time with configured timeout, allowing for a margin of error
85+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
86+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8687
}
8788

8889
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ public void ConnectShouldHaveRespectedTimeout()
8585
_stopWatch.ElapsedMilliseconds,
8686
_connectionInfo.Timeout.TotalMilliseconds);
8787

88-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
88+
// Compare elapsed time with configured timeout, allowing for a margin of error
89+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8990
}
9091

9192
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,9 @@ public void ConnectShouldHaveRespectedTimeout()
8888
_stopWatch.ElapsedMilliseconds,
8989
_connectionInfo.Timeout.TotalMilliseconds);
9090

91-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
92-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
91+
// Compare elapsed time with configured timeout, allowing for a margin of error
92+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
93+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
9394
}
9495

9596
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,9 @@ public void ConnectShouldHaveRespectedTimeout()
135135
_stopWatch.ElapsedMilliseconds,
136136
_connectionInfo.Timeout.TotalMilliseconds);
137137

138-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
139-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
138+
// Compare elapsed time with configured timeout, allowing for a margin of error
139+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
140+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
140141
}
141142

142143
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ public void ConnectShouldHaveRespectedTimeout()
105105
_stopWatch.ElapsedMilliseconds,
106106
_connectionInfo.Timeout.TotalMilliseconds);
107107

108-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
109-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
108+
// Compare elapsed time with configured timeout, allowing for a margin of error
109+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
110+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
110111
}
111112

112113
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_ConnectionToProxyRefused.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ public void ConnectShouldHaveRespectedTimeout()
7676
_stopWatch.ElapsedMilliseconds,
7777
_connectionInfo.Timeout.TotalMilliseconds);
7878

79-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
79+
// Compare elapsed time with configured timeout, allowing for a margin of error
80+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8081
}
8182

8283
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,9 @@ public void ConnectShouldHaveRespectedTimeout()
7878
_stopWatch.ElapsedMilliseconds,
7979
_connectionInfo.Timeout.TotalMilliseconds);
8080

81-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
82-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
81+
// Compare elapsed time with configured timeout, allowing for a margin of error
82+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
83+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8384
}
8485

8586
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,9 @@ public void ConnectShouldHaveRespectedTimeout()
109109
_stopWatch.ElapsedMilliseconds,
110110
_connectionInfo.Timeout.TotalMilliseconds);
111111

112-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
113-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
112+
// Compare elapsed time with configured timeout, allowing for a margin of error
113+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
114+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
114115
}
115116

116117
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,9 @@ public void ConnectShouldHaveRespectedTimeout()
105105
_stopWatch.ElapsedMilliseconds,
106106
_connectionInfo.Timeout.TotalMilliseconds);
107107

108-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
109-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
108+
// Compare elapsed time with configured timeout, allowing for a margin of error
109+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
110+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
110111
}
111112

112113
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,9 @@ public void ConnectShouldHaveRespectedTimeout()
9797
_stopWatch.ElapsedMilliseconds,
9898
_connectionInfo.Timeout.TotalMilliseconds);
9999

100-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
101-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
100+
// Compare elapsed time with configured timeout, allowing for a margin of error
101+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
102+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
102103
}
103104

104105
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_ConnectionToProxyRefused.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@ public void ConnectShouldHaveRespectedTimeout()
7777
_stopWatch.ElapsedMilliseconds,
7878
_connectionInfo.Timeout.TotalMilliseconds);
7979

80-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds, errorText);
80+
// Compare elapsed time with configured timeout, allowing for a margin of error
81+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8182
}
8283

8384
[TestMethod]

Diff for: ‎src/Renci.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ public void ConnectShouldHaveRespectedTimeout()
8080
_stopWatch.ElapsedMilliseconds,
8181
_connectionInfo.Timeout.TotalMilliseconds);
8282

83-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds, errorText);
84-
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < (_connectionInfo.Timeout.TotalMilliseconds + 100), errorText);
83+
// Compare elapsed time with configured timeout, allowing for a margin of error
84+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds >= _connectionInfo.Timeout.TotalMilliseconds - 10, errorText);
85+
Assert.IsTrue(_stopWatch.ElapsedMilliseconds < _connectionInfo.Timeout.TotalMilliseconds + 100, errorText);
8586
}
8687

8788
[TestMethod]

0 commit comments

Comments
 (0)