Skip to content

Commit 65feb12

Browse files
committed
TEST: Remove use of port 8122
Port 8122 is already bound in AppVeyor and therefore causes unexpected errors. Use dynamic port assignment (using port 0) where possible, port 8121 otherwise. Addtionally, add mock setup for IConnector.Dispose() where these mocks are used.
1 parent 8f0da78 commit 65feb12

File tree

51 files changed

+175
-124
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+175
-124
lines changed

src/Renci.SshNet.Tests/Classes/Channels/ChannelForwardedTcpipTest_Dispose_SessionIsConnectedAndChannelIsOpen.cs

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,16 @@ public void CleanUp()
6767
private void Arrange()
6868
{
6969
var random = new Random();
70+
71+
_remoteEndpoint = new IPEndPoint(IPAddress.Loopback, 0);
72+
73+
_remoteListener = new AsyncSocketListener(_remoteEndpoint);
74+
_remoteListener.Connected += socket => _connectedRegister.Add(socket);
75+
_remoteListener.Disconnected += socket => _disconnectedRegister.Add(socket);
76+
_remoteListener.Start();
77+
78+
_remoteEndpoint.Port = ((IPEndPoint)_remoteListener.ListenerEndPoint).Port;
79+
7080
_localChannelNumber = (uint) random.Next(0, int.MaxValue);
7181
_localWindowSize = (uint) random.Next(2000, 3000);
7282
_localPacketSize = (uint) random.Next(1000, 2000);
@@ -80,8 +90,6 @@ private void Arrange()
8090
_disconnectedRegister = new List<Socket>();
8191
_connectionInfoTimeout = TimeSpan.FromSeconds(5);
8292

83-
_remoteEndpoint = new IPEndPoint(IPAddress.Loopback, 8122);
84-
8593
_sessionMock = new Mock<ISession>(MockBehavior.Strict);
8694
_connectionInfoMock = new Mock<ISshConnectionInfo>(MockBehavior.Strict);
8795
_forwardedPortMock = new Mock<IForwardedPort>(MockBehavior.Strict);
@@ -124,11 +132,6 @@ private void Arrange()
124132
})
125133
.Returns(WaitResult.Success);
126134

127-
_remoteListener = new AsyncSocketListener(_remoteEndpoint);
128-
_remoteListener.Connected += socket => _connectedRegister.Add(socket);
129-
_remoteListener.Disconnected += socket => _disconnectedRegister.Add(socket);
130-
_remoteListener.Start();
131-
132135
_channel = new ChannelForwardedTcpip(
133136
_sessionMock.Object,
134137
_localChannelNumber,

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_ConnectionToProxyRefused.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ protected override void SetupData()
2828
"user",
2929
ProxyTypes.Http,
3030
IPAddress.Loopback.ToString(),
31-
8122,
31+
8121,
3232
"proxyUser",
3333
"proxyPwd",
3434
new KeyboardInteractiveAuthenticationMethod("user"));

src/Renci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ protected override void SetupData()
3131
"user",
3232
ProxyTypes.Http,
3333
IPAddress.Loopback.ToString(),
34-
8122,
34+
8121,
3535
"proxyUser",
3636
"proxyPwd",
3737
new KeyboardInteractiveAuthenticationMethod("user"));

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ConnectionClosedByServer_NoDataSentByServer.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected void Arrange()
5050
{
5151
_clientVersion = "\uD55C";
5252
_timeout = TimeSpan.FromSeconds(5);
53-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
53+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5454
_dataReceivedByServer = new List<byte>();
5555

5656
_server = new AsyncSocketListener(_serverEndPoint);
@@ -62,6 +62,8 @@ protected void Arrange()
6262
};
6363
_server.Disconnected += (socket) => _clientDisconnected = true;
6464

65+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
66+
6567
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
6668
_client.Connect(_serverEndPoint);
6769

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseContainsNullCharacter.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void Arrange()
5353
{
5454
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5555
_timeout = TimeSpan.FromSeconds(5);
56-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
56+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5757
_dataReceivedByServer = new List<byte>();
5858
_serverIdentification = Encoding.UTF8.GetBytes("\uD55C!\0\uD55CSSH -2.0-Renci.SshNet.SshClient.0.0.1");
5959

@@ -65,6 +65,8 @@ protected void Arrange()
6565
_dataReceivedByServer.AddRange(bytes);
6666
};
6767
_server.Disconnected += (socket) => _clientDisconnected = true;
68+
69+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
6870

6971
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
7072
_client.Connect(_serverEndPoint);

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseInvalid_SshIdentificationOnlyContainsProtocolVersion.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void Arrange()
5353
{
5454
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5555
_timeout = TimeSpan.FromSeconds(5);
56-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
56+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5757
_dataReceivedByServer = new List<byte>();
5858
_serverIdentification = Encoding.UTF8.GetBytes("SSH-2.0\r\n");
5959

@@ -66,6 +66,8 @@ protected void Arrange()
6666
socket.Shutdown(SocketShutdown.Send);
6767
};
6868
_server.Disconnected += (socket) => _clientDisconnected = true;
69+
70+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
6971

7072
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
7173
_client.Connect(_serverEndPoint);

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_Comments.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void Arrange()
5353
{
5454
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5555
_timeout = TimeSpan.FromSeconds(5);
56-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
56+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5757
_dataReceivedByServer = new List<byte>();
5858
_serverIdentification = Encoding.UTF8.GetBytes("\r\nWelcome stranger!\r\n\r\nSSH-ABC2.0-OurSSHAppliance-1.4.7 Use at own risk.\uD55C\r\n!");
5959

@@ -66,6 +66,8 @@ protected void Arrange()
6666
socket.Shutdown(SocketShutdown.Send);
6767
};
6868
_server.Disconnected += (socket) => _clientDisconnected = true;
69+
70+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
6971

7072
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
7173
_client.Connect(_serverEndPoint);

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_NoComments.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void Arrange()
5353
{
5454
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5555
_timeout = TimeSpan.FromSeconds(5);
56-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
56+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5757
_dataReceivedByServer = new List<byte>();
5858
_serverIdentification = Encoding.UTF8.GetBytes("Welcome stranger!\r\n\r\nSSH-Zero-OurSSHAppliance\r\n!");
5959

@@ -66,6 +66,8 @@ protected void Arrange()
6666
socket.Shutdown(SocketShutdown.Send);
6767
};
6868
_server.Disconnected += (socket) => _clientDisconnected = true;
69+
70+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
6971

7072
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
7173
_client.Connect(_serverEndPoint);

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_ServerResponseValid_TerminatedByLineFeedWithoutCarriageReturn.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected void Arrange()
5353
{
5454
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5555
_timeout = TimeSpan.FromSeconds(5);
56-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
56+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5757
_dataReceivedByServer = new List<byte>();
5858
_serverIdentification = Encoding.UTF8.GetBytes("Welcome stranger!\n\nSSH-Zero-OurSSHAppliance\n\0");
5959

@@ -67,6 +67,8 @@ protected void Arrange()
6767
};
6868
_server.Disconnected += (socket) => _clientDisconnected = true;
6969

70+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
71+
7072
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
7173
_client.Connect(_serverEndPoint);
7274

src/Renci.SshNet.Tests/Classes/Connection/ProtocolVersionExchangeTest_TimeoutReadingIdentificationString.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ protected void Arrange()
5151
{
5252
_clientVersion = "SSH-2.0-Renci.SshNet.SshClient.0.0.1";
5353
_timeout = TimeSpan.FromMilliseconds(200);
54-
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 8122);
54+
_serverEndPoint = new IPEndPoint(IPAddress.Loopback, 0);
5555
_dataReceivedByServer = new List<byte>();
5656
_clientDisconnected = false;
5757

@@ -63,6 +63,8 @@ protected void Arrange()
6363
socket.Send(Encoding.UTF8.GetBytes("Welcome!\r\n"));
6464
};
6565
_server.Disconnected += (socket) => _clientDisconnected = true;
66+
67+
_serverEndPoint.Port = ((IPEndPoint)_server.ListenerEndPoint).Port;
6668

6769
_client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
6870
_client.Connect(_serverEndPoint);

0 commit comments

Comments
 (0)