Skip to content

Replace custom TestMethodForPlatformAttribute with MSTest OSCondition #1766

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

Open
Copilot wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Replace custom TestMethodForPlatformAttribute with MSTest OSCondition #1766

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ea2f416
Initial plan
Copilot Feb 8, 2026
ec7c88a
Replace TestMethodForPlatformAttribute with OSCondition attribute
Copilot Feb 8, 2026
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
11 changes: 6 additions & 5 deletions ....SshNet.Tests/Classes/Connection/DirectConnectorTest_Connect_TimeoutConnectingToServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
using System.Globalization;
using System.Net;
using System.Net.Sockets;
using System.Runtime.InteropServices;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;

using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes.Connection
{
Expand Down Expand Up @@ -72,23 +70,26 @@ protected override void Act()
}
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Linux))]
[TestMethod]
[OSCondition(OperatingSystems.Linux)]
public void ConnectShouldHaveThrownSocketExceptionOnLinux()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SocketException>(_actualException);
Assert.AreEqual("Connection refused", _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveRespectedTimeoutOnWindows()
{
var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
Expand Down
11 changes: 6 additions & 5 deletions ...nci.SshNet.Tests/Classes/Connection/HttpConnectorTest_Connect_TimeoutConnectingToProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@
using System.Globalization;
using System.Net;
using System.Net.Sockets;
using System.Runtime.InteropServices;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;

using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes.Connection
{
Expand Down Expand Up @@ -82,23 +80,26 @@ protected override void Act()
}
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Linux))]
[TestMethod]
[OSCondition(OperatingSystems.Linux)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SocketException>(_actualException);
Assert.AreEqual("Connection refused", _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveRespectedTimeoutOnWindows()
{
var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
Expand Down
11 changes: 6 additions & 5 deletions ...i.SshNet.Tests/Classes/Connection/Socks4ConnectorTest_Connect_TimeoutConnectingToProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
using System.Diagnostics;
using System.Globalization;
using System.Net.Sockets;
using System.Runtime.InteropServices;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;

using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes.Connection
{
Expand Down Expand Up @@ -70,23 +68,26 @@ protected override void Act()
}
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Linux))]
[TestMethod]
[OSCondition(OperatingSystems.Linux)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SocketException>(_actualException);
Assert.AreEqual("Connection refused", _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveRespectedTimeoutOnWindows()
{
var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
Expand Down
11 changes: 6 additions & 5 deletions ...i.SshNet.Tests/Classes/Connection/Socks5ConnectorTest_Connect_TimeoutConnectingToProxy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,12 @@
using System.Diagnostics;
using System.Globalization;
using System.Net.Sockets;
using System.Runtime.InteropServices;

using Microsoft.VisualStudio.TestTools.UnitTesting;

using Moq;

using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes.Connection
{
Expand Down Expand Up @@ -71,23 +69,26 @@ protected override void Act()
}
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnWindows()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SshOperationTimeoutException>(_actualException);
Assert.AreEqual(string.Format(CultureInfo.InvariantCulture, "Connection failed to establish within {0} milliseconds.", _connectionInfo.Timeout.TotalMilliseconds), _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Linux))]
[TestMethod]
[OSCondition(OperatingSystems.Linux)]
public void ConnectShouldHaveThrownSshOperationTimeoutExceptionOnLinux()
{
Assert.IsNull(_actualException.InnerException);
Assert.IsInstanceOfType<SocketException>(_actualException);
Assert.AreEqual("Connection refused", _actualException.Message);
}

[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ConnectShouldHaveRespectedTimeoutOnWindows()
{
var errorText = string.Format("Elapsed: {0}, Timeout: {1}",
Expand Down
5 changes: 2 additions & 3 deletions ...enci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Dispose_PortStarted_ChannelNotBound.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Threading;

using Microsoft.Extensions.Logging.Abstractions;
Expand All @@ -12,7 +11,6 @@

using Renci.SshNet.Channels;
using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes
{
Expand Down Expand Up @@ -108,7 +106,8 @@ public void ForwardedPortShouldRefuseNewConnections()
}

// TODO We should investigate why this method doesn't work on Linux
[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ExistingConnectionShouldBeClosed()
{
try
Expand Down
5 changes: 2 additions & 3 deletions test/Renci.SshNet.Tests/Classes/ForwardedPortDynamicTest_Stop_PortStarted_ChannelNotBound.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
using System.Collections.Generic;
using System.Net;
using System.Net.Sockets;
using System.Runtime.InteropServices;
using System.Threading;

using Microsoft.Extensions.Logging.Abstractions;
Expand All @@ -12,7 +11,6 @@

using Renci.SshNet.Channels;
using Renci.SshNet.Common;
using Renci.SshNet.Tests.Common;

namespace Renci.SshNet.Tests.Classes
{
Expand Down Expand Up @@ -112,7 +110,8 @@ public void ForwardedPortShouldRefuseNewConnections()
}

// TODO We should investigate why this method doesn't work on Linux
[TestMethodForPlatform(nameof(OSPlatform.Windows))]
[TestMethod]
[OSCondition(OperatingSystems.Windows)]
public void ExistingConnectionShouldBeClosed()
{
try
Expand Down
39 changes: 0 additions & 39 deletions test/Renci.SshNet.Tests/Common/TestMethodForPlatformAttribute.cs
View file
Open in desktop

This file was deleted.