Fix embarrassing last-minute test failures

sshnet · Mar 9, 2024 · 19f9d2f · 19f9d2f
1 parent 49fdfee
commit 19f9d2f
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 7 deletions.
diff --git a/...ci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs b/...ci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingHttpContent.cs
@@ -119,7 +119,8 @@ protected override void Act()
         [TestMethod]
         public void ConnectShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 

diff --git a/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs b/...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutReadingStatusLine.cs
@@ -95,7 +95,8 @@ protected override void Act()
         [TestMethod]
         public void ConnectShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 

diff --git a/...ests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs b/...ests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs
@@ -93,8 +93,8 @@ protected void Act()
         [TestMethod]
         public void StartShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNotNull(_actualException);
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format("Socket read operation has timed out after {0} milliseconds.", _timeout.TotalMilliseconds), _actualException.Message);
         }
 

diff --git a/....Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs b/....Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingDestinationAddress.cs
@@ -97,7 +97,8 @@ protected override void Act()
         [TestMethod]
         public void ConnectShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 

diff --git a/...ci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs b/...ci.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyCode.cs
@@ -93,7 +93,8 @@ protected override void Act()
         [TestMethod]
         public void ConnectShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }
 

diff --git a/...SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs b/...SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutReadingReplyVersion.cs
@@ -82,7 +82,8 @@ protected override void Act()
         [TestMethod]
         public void ConnectShouldHaveThrownSshOperationTimeoutException()
         {
-            Assert.IsNull(_actualException.InnerException);
+            Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
+            Assert.IsInstanceOfType<SocketException>(_actualException.InnerException);
             Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Socket read operation has timed out after {0:F0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
         }