gsadmin/ssh.net
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-09-10 17:25:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Since Dispose now also invokes Disconnect, we no longer need to explicitly invoke Disconnect.

Browse Source
This commit is contained in:
drieseng
2016-09-11 21:09:50 +02:00
parent 3bd1b4eec0
commit edde414ef3
12 changed files with 23 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Connected.cs
+2 -3
View File
@@ -45,7 +45,6 @@ namespace Renci.SshNet.Tests.Classes
_netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -76,9 +75,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disconnected.cs
+2 -3
View File
@@ -45,7 +45,6 @@ namespace Renci.SshNet.Tests.Classes
_netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -78,9 +77,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/NetConfClientTest_Dispose_Disposed.cs
+2 -3
View File
@@ -45,7 +45,6 @@ namespace Renci.SshNet.Tests.Classes
_netConfSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_netConfSessionMock.InSequence(sequence).Setup(p => p.Dispose());
@@ -77,9 +76,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Connected.cs
+2 -3
View File
@@ -49,7 +49,6 @@ namespace Renci.SshNet.Tests.Classes
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sftpClient.Connect();
@@ -81,9 +80,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disconnected.cs
+2 -3
View File
@@ -49,7 +49,6 @@ namespace Renci.SshNet.Tests.Classes
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sftpClient.Connect();
@@ -82,9 +81,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SftpClientTest_Dispose_Disposed.cs
+2 -3
View File
@@ -49,7 +49,6 @@ namespace Renci.SshNet.Tests.Classes
_sftpSessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sftpSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sftpClient.Connect();
@@ -82,9 +81,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SshClientTest_Disconnect_ForwardedPortStarted.cs
+2 -3
View File
@@ -40,7 +40,6 @@ namespace Renci.SshNet.Tests.Classes
_forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -68,9 +67,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Connected.cs
+2 -3
View File
@@ -34,7 +34,6 @@ namespace Renci.SshNet.Tests.Classes
_serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
_sessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -53,9 +52,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disconnected.cs
+2 -3
View File
@@ -34,7 +34,6 @@ namespace Renci.SshNet.Tests.Classes
_serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
_sessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -54,9 +53,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_Disposed.cs
+2 -3
View File
@@ -34,7 +34,6 @@ namespace Renci.SshNet.Tests.Classes
_serviceFactoryMock.InSequence(sequence).Setup(p => p.CreateSession(_connectionInfo)).Returns(_sessionMock.Object);
_sessionMock.InSequence(sequence).Setup(p => p.Connect());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -54,9 +53,9 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
src/Renci.SshNet.Tests/Classes/SshClientTest_Dispose_ForwardedPortStarted.cs
+3 -4
View File
@@ -41,7 +41,6 @@ namespace Renci.SshNet.Tests.Classes
_forwardedPortMock.InSequence(sequence).Setup(p => p.Start());
_sessionMock.InSequence(sequence).Setup(p => p.OnDisconnecting());
_forwardedPortMock.InSequence(sequence).Setup(p => p.Stop());
_sessionMock.InSequence(sequence).Setup(p => p.Disconnect());
_sessionMock.InSequence(sequence).Setup(p => p.Dispose());
_sshClient = new SshClient(_connectionInfo, false, _serviceFactoryMock.Object);
@@ -83,15 +82,15 @@ namespace Renci.SshNet.Tests.Classes
}
[TestMethod]
public void DisconnectOnSessionShouldBeInvokedOnce()
public void DisconnectOnSessionShouldNeverBeInvoked()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Disconnect(), Times.Never);
}
[TestMethod]
public void DisposeOnSessionShouldBeInvokedOnce()
{
_sessionMock.Verify(p => p.Disconnect(), Times.Once);
_sessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
src/Renci.SshNet/BaseClient.cs
-1
View File
@@ -239,7 +239,6 @@ namespace Renci.SshNet
// dereference the current session here
Session.ErrorOccured -= Session_ErrorOccured;
Session.HostKeyReceived -= Session_HostKeyReceived;
Session.Disconnect();
Session.Dispose();
Session = null;
}