Try to stabilise a few tests (#1278)

* Try to stabilise a few tests

* Fix random 0 buffer sizes

---------

Co-authored-by: Wojciech Nagórski <wojtpl2@gmail.com>

test/Renci.SshNet.IntegrationTests/OldIntegrationTests/SshCommandTest.cs

@@ -290,13 +290,11 @@ namespace Renci.SshNet.IntegrationTests.OldIntegrationTests
                 {
                     callbackCalled = true;
                 }), null);
-                while (!asyncResult.IsCompleted)
-                {
-                    Thread.Sleep(100);
-                }
 
                 cmd.EndExecute(asyncResult);
 
+                Thread.Sleep(100);
+
                 Assert.IsTrue(callbackCalled);
 
                 client.Disconnect();
@@ -318,13 +316,11 @@ namespace Renci.SshNet.IntegrationTests.OldIntegrationTests
                 {
                     callbackThreadId = Thread.CurrentThread.ManagedThreadId;
                 }), null);
-                while (!asyncResult.IsCompleted)
-                {
-                    Thread.Sleep(100);
-                }
 
                 cmd.EndExecute(asyncResult);
 
+                Thread.Sleep(100);
+
                 Assert.AreNotEqual(currentThreadId, callbackThreadId);
 
                 client.Disconnect();

test/Renci.SshNet.IntegrationTests/SftpTests.cs

@@ -6230,19 +6230,14 @@ namespace Renci.SshNet.IntegrationTests
             client.Connect();
 
             using var fileStream = new MemoryStream(Encoding.UTF8.GetBytes(testContent));
-            var currentTime = DateTime.UtcNow;
             
             client.UploadFile(fileStream, testFilePath);
             try
             {
-                var time = client.GetLastWriteTimeUtc(testFilePath);
-
-                DateTimeAssert.AreEqual(currentTime.TruncateToWholeSeconds(), time);
-
                 var newTime = new DateTime(1986, 03, 15, 01, 02, 03, 123, DateTimeKind.Utc);
 
                 client.SetLastWriteTimeUtc(testFilePath, newTime);
-                time = client.GetLastWriteTimeUtc(testFilePath);
+                var time = client.GetLastWriteTimeUtc(testFilePath);
 
                 DateTimeAssert.AreEqual(newTime.TruncateToWholeSeconds(), time);
             }

test/Renci.SshNet.Tests/Classes/Channels/ChannelDirectTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs

@@ -175,6 +175,8 @@ namespace Renci.SshNet.Tests.Classes.Channels
         private void Act()
         {
             _channel?.Dispose();
+
+            Thread.Sleep(200);
         }
 
         [TestMethod]

test/Renci.SshNet.Tests/Classes/ForwardedPortRemoteTest_Start_PortNeverStarted.cs

@@ -122,6 +122,8 @@ namespace Renci.SshNet.Tests.Classes
                     new ForwardedTcpipChannelInfo(_forwardedPort.BoundHost, _forwardedPort.BoundPort, originatorAddress,
                         originatorPort))));
 
+            Thread.Sleep(200);
+
             _sessionMock.Verify(p => p.CreateChannelForwardedTcpip(channelNumber, initialWindowSize, maximumPacketSize), Times.Once);
             channelMock.Verify(p => p.Bind(It.Is<IPEndPoint>(ep => ep.Address.Equals(_remoteEndpoint.Address) && ep.Port == _remoteEndpoint.Port), _forwardedPort), Times.Once);
             channelMock.Verify(p => p.Dispose(), Times.Once);

test/Renci.SshNet.Tests/Classes/SessionTest_Connected.cs

@@ -45,6 +45,8 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void SendMessageShouldSendPacketToServer()
         {
+            Thread.Sleep(100);
+
             ServerBytesReceivedRegister.Clear();
 
             Session.SendMessage(_ignoreMessage);
@@ -123,6 +125,8 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ISession_SendMessageShouldSendPacketToServer()
         {
+            Thread.Sleep(100);
+
             var session = (ISession) Session;
             ServerBytesReceivedRegister.Clear();
 
@@ -137,6 +141,8 @@ namespace Renci.SshNet.Tests.Classes
         [TestMethod]
         public void ISession_TrySendMessageShouldSendPacketToServerAndReturnTrue()
         {
+            Thread.Sleep(100);
+
             var session = (ISession) Session;
             ServerBytesReceivedRegister.Clear();
 

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessRead.cs

@@ -25,8 +25,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(3, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessReadWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(3, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Closed_FileAccessWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(3, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessRead.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessReadWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanRead_Disposed_FileAccessWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessRead.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessReadWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Closed_FileAccessWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessRead.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessReadWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_CanWrite_Disposed_FileAccessWrite.cs

@@ -24,9 +24,9 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             var random = new Random();
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
-            _bufferSize = (uint) random.Next(0, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _bufferSize = (uint) random.Next(1, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_Disposed.cs

@@ -24,8 +24,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionNotOpen.cs

@@ -24,8 +24,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Close_SessionOpen.cs

@@ -27,8 +27,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Closed.cs

@@ -27,8 +27,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(random.Next(1, 5), random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_Disposed.cs

@@ -24,8 +24,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionNotOpen.cs

@@ -27,8 +27,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Dispose_SessionOpen.cs

@@ -28,8 +28,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = GenerateRandom(2, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_Finalize_SessionOpen.cs

@@ -25,8 +25,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = GenerateRandom(7, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_ReadByte_ReadMode_NoDataInWriteBufferAndNoDataInReadBuffer_Eof.cs

@@ -25,8 +25,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(1, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
         }
 
         protected override void SetupMocks()

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_Disposed.cs

@@ -31,8 +31,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
 
             _sftpSessionMock = new Mock<ISftpSession>(MockBehavior.Strict);
 

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionNotOpen.cs

@@ -26,8 +26,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(4, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
             _length = random.Next();
         }
 

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessRead.cs

@@ -26,8 +26,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString();
             _handle = GenerateRandom(5, random);
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
             _length = random.Next();
         }
 

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessReadWrite.cs

@@ -44,8 +44,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
             _length = random.Next();
 
             _fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());

test/Renci.SshNet.Tests/Classes/Sftp/SftpFileStreamTest_SetLength_SessionOpen_FIleAccessWrite.cs

@@ -44,8 +44,8 @@ namespace Renci.SshNet.Tests.Classes.Sftp
             _path = random.Next().ToString(CultureInfo.InvariantCulture);
             _handle = new[] {(byte) random.Next(byte.MinValue, byte.MaxValue)};
             _bufferSize = (uint) random.Next(1, 1000);
-            _readBufferSize = (uint) random.Next(0, 1000);
-            _writeBufferSize = (uint) random.Next(0, 1000);
+            _readBufferSize = (uint) random.Next(1, 1000);
+            _writeBufferSize = (uint) random.Next(1, 1000);
             _length = random.Next();
 
             _fileAttributesLastAccessTime = DateTime.UtcNow.AddSeconds(random.Next());