Skip to content

Remove enormous array allocations in tests causing instability in CI#1367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Rob-Hague merged 8 commits into from
Apr 6, 2024
Merged

Remove enormous array allocations in tests causing instability in CI #1367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3878072
debugging CI
Rob-Hague Apr 1, 2024
e10e4ef
apt-get
Rob-Hague Apr 1, 2024
41a8115
print memory
Rob-Hague Apr 4, 2024
5ae7237
x
Rob-Hague Apr 4, 2024
60a4daa
x
Rob-Hague Apr 4, 2024
e39a872
Remove some unbounded random.Next() calls
Rob-Hague Apr 4, 2024
bcfc27d
cleanup
Rob-Hague Apr 4, 2024
51fe29f
Merge branch 'develop' into Rob-Hague-patch-1
Rob-Hague Apr 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions ...i.SshNet.Tests/Classes/ServiceFactoryTest_CreateShellStream_ChannelOpenThrowsException.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand DownExpand Up@@ -27,15 +26,13 @@ public class ServiceFactoryTest_CreateShellStream_ChannelOpenThrowsException

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint) random.Next();
_rows = (uint) random.Next();
_width = (uint) random.Next();
_height = (uint) random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
_channelOpenException = new SshException();

_actualException = null;
Expand DownExpand Up@@ -117,4 +114,4 @@ public void DisposeOnChannelSessionShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
}
19 changes: 8 additions & 11 deletions ...sts/Classes/ServiceFactoryTest_CreateShellStream_SendPseudoTerminalRequestReturnsFalse.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand All@@ -26,15 +25,13 @@ public class ServiceFactoryTest_CreateShellStream_SendPseudoTerminalRequestRetur

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint)random.Next();
_rows = (uint)random.Next();
_width = (uint)random.Next();
_height = (uint)random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
_actualException = null;
}

Expand DownExpand Up@@ -117,4 +114,4 @@ public void DisposeOnChannelSessionShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
}
19 changes: 8 additions & 11 deletions .../Classes/ServiceFactoryTest_CreateShellStream_SendPseudoTerminalRequestThrowsException.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand DownExpand Up@@ -27,15 +26,13 @@ public class ServiceFactoryTest_CreateShellStream_SendPseudoTerminalRequestThrow

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint) random.Next();
_rows = (uint) random.Next();
_width = (uint) random.Next();
_height = (uint) random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
_sendPseudoTerminalRequestException = new SshException();

_actualException = null;
Expand DownExpand Up@@ -119,4 +116,4 @@ public void DisposeOnChannelSessionShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
}
19 changes: 8 additions & 11 deletions ...SshNet.Tests/Classes/ServiceFactoryTest_CreateShellStream_SendShellRequestReturnsFalse.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand All@@ -26,15 +25,13 @@ public class ServiceFactoryTest_CreateShellStream_SendShellRequestReturnsFalse

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint) random.Next();
_rows = (uint) random.Next();
_width = (uint) random.Next();
_height = (uint) random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
_actualException = null;
}

Expand DownExpand Up@@ -120,4 +117,4 @@ public void DisposeOnChannelSessionShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
}
19 changes: 8 additions & 11 deletions ...Net.Tests/Classes/ServiceFactoryTest_CreateShellStream_SendShellRequestThrowsException.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand DownExpand Up@@ -27,15 +26,13 @@ public class ServiceFactoryTest_CreateShellStream_SendShellRequestThrowsExceptio

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint) random.Next();
_rows = (uint) random.Next();
_width = (uint) random.Next();
_height = (uint) random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
_sendShellRequestException = new SshException();
_actualException = null;
}
Expand DownExpand Up@@ -121,4 +118,4 @@ public void DisposeOnChannelSessionShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.Dispose(), Times.Once);
}
}
}
}
19 changes: 8 additions & 11 deletions test/Renci.SshNet.Tests/Classes/ServiceFactoryTest_CreateShellStream_Success.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
using System;
using System.Collections.Generic;
using System.Collections.Generic;
using System.Text;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using Moq;
Expand All@@ -26,15 +25,13 @@ public class ServiceFactoryTest_CreateShellStream_Success

private void SetupData()
{
var random = new Random();

_terminalName = random.Next().ToString();
_columns = (uint) random.Next();
_rows = (uint) random.Next();
_width = (uint) random.Next();
_height = (uint) random.Next();
_terminalName = "test";
_columns = 80;
_rows = 20;
_width = 300;
_height = 100;
_terminalModeValues = new Dictionary<TerminalModes, uint>();
_bufferSize = random.Next();
_bufferSize = 512;
}

private void CreateMocks()
Expand DownExpand Up@@ -124,4 +121,4 @@ public void SendShellRequestShouldHaveBeenInvokedOnce()
_channelSessionMock.Verify(p => p.SendShellRequest(), Times.Once);
}
}
}
}
2 changes: 1 addition & 1 deletion ...est_Read_ReahAheadExceptionInBeginRead.cs → ...est_Read_ReadAheadExceptionInBeginRead.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@
namespace Renci.SshNet.Tests.Classes.Sftp
{
[TestClass]
public class SftpFileReaderTest_Read_ReahAheadExceptionInBeginRead : SftpFileReaderTestBase
public class SftpFileReaderTest_Read_ReadAheadExceptionInBeginRead : SftpFileReaderTestBase
{
private const int ChunkLength = 32 * 1024;

Expand Down
2 changes: 1 addition & 1 deletion ...Classes/Sftp/SftpFileReaderTest_Read_ReadAheadExceptionInWaitOnHandle_NoChunkAvailable.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,7 @@ protected override void SetupData()
var random = new Random();

_handle = CreateByteArray(random, 5);
_fileSize = random.Next();
_fileSize = 1234;
_waitHandleArray = new WaitHandle[2];
_operationTimeout = random.Next(10000, 20000);
_closeAsyncResult = new SftpCloseAsyncResult(null, null);
Expand Down
2 changes: 1 addition & 1 deletion test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,7 +28,7 @@ protected override void SetupData()
_bufferSize = (uint) random.Next(1, 1000);
_readBufferSize = (uint) random.Next(1, 1000);
_writeBufferSize = (uint) random.Next(1, 1000);
_length = random.Next();
_length = 5555;
}

protected override void SetupMocks()
Expand Down
4 changes: 2 additions & 2 deletions ...t_SetLength_SessionOpen_FIleAccessRead.cs → ...t_SetLength_SessionOpen_FileAccessRead.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@
namespace Renci.SshNet.Tests.Classes.Sftp
{
[TestClass]
public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccess : SftpFileStreamTestBase
public class SftpFileStreamTest_SetLength_SessionOpen_FileAccessRead : SftpFileStreamTestBase
{
private SftpFileStream _target;
private string _path;
Expand All@@ -28,7 +28,7 @@ protected override void SetupData()
_bufferSize = (uint) random.Next(1, 1000);
_readBufferSize = (uint) random.Next(1, 1000);
_writeBufferSize = (uint) random.Next(1, 1000);
_length = random.Next();
_length = 6666;
}

protected override void SetupMocks()
Expand Down
4 changes: 2 additions & 2 deletions ...Length_SessionOpen_FIleAccessReadWrite.cs → ...Length_SessionOpen_FileAccessReadWrite.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
namespace Renci.SshNet.Tests.Classes.Sftp
{
[TestClass]
public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite
public class SftpFileStreamTest_SetLength_SessionOpen_FileAccessReadWrite
{
private Mock<ISftpSession> _sftpSessionMock;
private string _path;
Expand DownExpand Up@@ -46,7 +46,7 @@ protected void Arrange()
_bufferSize = (uint) random.Next(1, 1000);
_readBufferSize = (uint) random.Next(1, 1000);
_writeBufferSize = (uint) random.Next(1, 1000);
_length = random.Next();
_length = 7777;

_fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());
_fileAttributesLastWriteTime = DateTime.UtcNow.AddSeconds(random.Next());
Expand Down
4 changes: 2 additions & 2 deletions ..._SetLength_SessionOpen_FIleAccessWrite.cs → ..._SetLength_SessionOpen_FileAccessWrite.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@
namespace Renci.SshNet.Tests.Classes.Sftp
{
[TestClass]
public class SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite
public class SftpFileStreamTest_SetLength_SessionOpen_FileAccessWrite
{
private Mock<ISftpSession> _sftpSessionMock;
private string _path;
Expand DownExpand Up@@ -46,7 +46,7 @@ protected void Arrange()
_bufferSize = (uint) random.Next(1, 1000);
_readBufferSize = (uint) random.Next(1, 1000);
_writeBufferSize = (uint) random.Next(1, 1000);
_length = random.Next();
_length = 8888;

_fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());
_fileAttributesLastWriteTime = DateTime.UtcNow.AddSeconds(random.Next());
Expand Down
8 changes: 4 additions & 4 deletions .../Sftp/SftpFileStreamTest_Write_SessionOpen_CountGreatherThanTwoTimesTheWriteBufferSize.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -121,10 +121,10 @@ public void LengthShouldFlushBufferAndReturnSizeOfFile()
{
var lengthFileAttributes = new SftpFileAttributes(DateTime.UtcNow,
DateTime.UtcNow,
_random.Next(),
_random.Next(),
_random.Next(),
(uint) _random.Next(0, int.MaxValue),
123,
456,
789,
7,
null);
byte[] actualFlushedData = null;

Expand Down