From 3baf96b5a52a380518109f22a2ea335a742b084a Mon Sep 17 00:00:00 2001 From: Dmitry Kropachev Date: Thu, 18 Sep 2025 08:47:19 -0400 Subject: [PATCH] Update ssh.net to 2025.0.0 New version has int? in SshCommand.ExitStatus instead of int. Small code changes needed to address that. --- .../Cassandra.IntegrationTests.csproj | 2 +- src/Cassandra.IntegrationTests/TestBase/TestUtils.cs | 2 +- .../TestClusterManagement/RemoteCcmProcessExecuter.cs | 1 + src/Cassandra.Tests/TestTimeoutAttribute.cs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj index da119bc7d..4d114208c 100644 --- a/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj +++ b/src/Cassandra.IntegrationTests/Cassandra.IntegrationTests.csproj @@ -56,7 +56,7 @@ - + diff --git a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs index 567ca94e6..024dc895c 100644 --- a/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs +++ b/src/Cassandra.IntegrationTests/TestBase/TestUtils.cs @@ -665,7 +665,7 @@ public static void WaitForSchemaAgreement(CcmClusterInfo clusterInfo) /// public class ProcessOutput { - public int ExitCode { get; set; } + public int? ExitCode { get; set; } public StringBuilder OutputText { get; set; } diff --git a/src/Cassandra.IntegrationTests/TestClusterManagement/RemoteCcmProcessExecuter.cs b/src/Cassandra.IntegrationTests/TestClusterManagement/RemoteCcmProcessExecuter.cs index 4e207cf94..747661f96 100644 --- a/src/Cassandra.IntegrationTests/TestClusterManagement/RemoteCcmProcessExecuter.cs +++ b/src/Cassandra.IntegrationTests/TestClusterManagement/RemoteCcmProcessExecuter.cs @@ -79,6 +79,7 @@ public override ProcessOutput ExecuteCcm(string args, bool throwOnProcessError = _sshClient.Connect(); var result = _sshClient.RunCommand(string.Format(@"{0} {1}", executable, args)); + output.ExitCode = result.ExitStatus; if (result.Error != null) { diff --git a/src/Cassandra.Tests/TestTimeoutAttribute.cs b/src/Cassandra.Tests/TestTimeoutAttribute.cs index 09fa28301..b330f2732 100644 --- a/src/Cassandra.Tests/TestTimeoutAttribute.cs +++ b/src/Cassandra.Tests/TestTimeoutAttribute.cs @@ -21,7 +21,7 @@ namespace Cassandra.Tests { [AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method, Inherited = false)] public class TestTimeoutAttribute : - Attribute + Attribute { /// /// Construct a TimeoutAttribute given a time in milliseconds