GithubStar/SSH.NET
1
0
Fork 0
mirror of https://github.com/sshnet/SSH.NET.git synced 2026-10-17 05:21:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some test failures on .NET Core.

Browse Source
This commit is contained in:
drieseng
2020-12-30 15:13:57 +01:00
parent d5fefcc369
commit a5148aea1a
7 changed files with 71 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndDirectoryInfo_SendExecRequestReturnsFalse.cs
+4
View File
@@ -55,6 +55,10 @@ namespace Renci.SshNet.Tests.Classes
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndFileInfo_SendExecRequestReturnsFalse.cs
+4
View File
@@ -54,6 +54,10 @@ namespace Renci.SshNet.Tests.Classes
.Setup(p => p.SendExecRequest(string.Format("scp -pf {0}", _transformedPath))).Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
src/Renci.SshNet.Tests/Classes/ScpClientTest_Download_PathAndStream_SendExecRequestReturnsFalse.cs
+14 -9
View File
@@ -19,15 +19,6 @@ namespace Renci.SshNet.Tests.Classes
private IList<ScpUploadEventArgs> _uploadingRegister;
private SshException _actualException;
[TestCleanup]
public void Cleanup()
{
if (_destination != null)
{
_destination.Dispose();
}
}
protected override void SetupData()
{
var random = new Random();
@@ -64,6 +55,10 @@ namespace Renci.SshNet.Tests.Classes
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
@@ -75,6 +70,16 @@ namespace Renci.SshNet.Tests.Classes
_scpClient.Connect();
}
protected override void TearDown()
{
base.TearDown();
if (_destination != null)
{
_destination.Dispose();
}
}
protected override void Act()
{
try
src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_DirectoryInfoAndPath_SendExecRequestReturnsFalse.cs
+4
View File
@@ -54,6 +54,10 @@ namespace Renci.SshNet.Tests.Classes
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_SendExecRequestReturnsFalse.cs
+16 -11
View File
@@ -21,16 +21,6 @@ namespace Renci.SshNet.Tests.Classes
private IList<ScpUploadEventArgs> _uploadingRegister;
private SshException _actualException;
[TestCleanup]
public void Cleanup()
{
if (_fileName != null)
{
File.Delete(_fileName);
_fileName = null;
}
}
protected override void SetupData()
{
var random = new Random();
@@ -70,7 +60,11 @@ namespace Renci.SshNet.Tests.Classes
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
}
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
{
@@ -81,6 +75,17 @@ namespace Renci.SshNet.Tests.Classes
_scpClient.Connect();
}
protected override void TearDown()
{
base.TearDown();
if (_fileName != null)
{
File.Delete(_fileName);
_fileName = null;
}
}
protected override void Act()
{
try
src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_FileInfoAndPath_Success.cs
+15 -10
View File
@@ -25,16 +25,6 @@ namespace Renci.SshNet.Tests.Classes
private int _fileSize;
private IList<ScpUploadEventArgs> _uploadingRegister;
[TestCleanup]
public void Cleanup()
{
if (_fileName != null)
{
File.Delete(_fileName);
_fileName = null;
}
}
protected override void SetupData()
{
var random = new Random();
@@ -95,6 +85,10 @@ namespace Renci.SshNet.Tests.Classes
_pipeStreamMock.InSequence(sequence).Setup(p => p.ReadByte()).Returns(0);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
@@ -109,6 +103,17 @@ namespace Renci.SshNet.Tests.Classes
_scpClient.Connect();
}
protected override void TearDown()
{
base.TearDown();
if (_fileName != null)
{
File.Delete(_fileName);
_fileName = null;
}
}
protected override void Act()
{
_scpClient.Upload(_fileInfo, _remotePath);
src/Renci.SshNet.Tests/Classes/ScpClientTest_Upload_StreamAndPath_SendExecRequestReturnsFalse.cs
+14 -9
View File
@@ -20,15 +20,6 @@ namespace Renci.SshNet.Tests.Classes
private IList<ScpUploadEventArgs> _uploadingRegister;
private SshException _actualException;
[TestCleanup]
public void Cleanup()
{
if (_source != null)
{
_source.Dispose();
}
}
protected override void SetupData()
{
var random = new Random();
@@ -67,6 +58,10 @@ namespace Renci.SshNet.Tests.Classes
.Returns(false);
_channelSessionMock.InSequence(sequence).Setup(p => p.Dispose());
_pipeStreamMock.As<IDisposable>().InSequence(sequence).Setup(p => p.Dispose());
// On .NET Core, Dispose() in turn invokes Close() and since we're not mocking
// an interface, we need to expect this call as well
_pipeStreamMock.Setup(p => p.Close());
}
protected override void Arrange()
@@ -78,6 +73,16 @@ namespace Renci.SshNet.Tests.Classes
_scpClient.Connect();
}
protected override void TearDown()
{
base.TearDown();
if (_source != null)
{
_source.Dispose();
}
}
protected override void Act()
{
try