merge #1553

sshnet · Jan 3, 2025 · cb4f1b3 · cb4f1b3
1 parent 7c9405f
commit cb4f1b3
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 12 deletions.
diff --git a/test/Renci.SshNet.IntegrationTests/KeyExchangeAlgorithmTests.cs b/test/Renci.SshNet.IntegrationTests/KeyExchangeAlgorithmTests.cs
@@ -23,7 +23,6 @@ public void TearDown()
         }
 
         [TestMethod]
-        [Ignore]
         public void SNtruP761X25519Sha512()
         {
             _remoteSshdConfig.ClearKeyExchangeAlgorithms()

diff --git a/test/Renci.SshNet.IntegrationTests/SshConnectionDisruptor.cs b/test/Renci.SshNet.IntegrationTests/SshConnectionDisruptor.cs
@@ -22,19 +22,24 @@ public SshConnectionRestorer BreakConnections()
 
         private static void PauseSshd(SshClient client)
         {
-            var command = client.CreateCommand("sudo echo 'DenyUsers sshnet' >> /etc/ssh/sshd_config");
-            var output = command.Execute();
-            if (command.ExitStatus != 0)
+            using (var command = client.CreateCommand("sudo echo 'DenyUsers sshnet' >> /etc/ssh/sshd_config"))
             {
-                throw new ApplicationException(
-                    $"Blocking user sshnet failed with exit code {command.ExitStatus}.\r\n{output}\r\n{command.Error}");
+                var output = command.Execute();
+                if (command.ExitStatus != 0)
+                {
+                    throw new ApplicationException(
+                        $"Blocking user sshnet failed with exit code {command.ExitStatus}.\r\n{output}\r\n{command.Error}");
+                }
             }
-            command = client.CreateCommand("sudo pkill -9 -U sshnet -f sshd.pam");
-            output = command.Execute();
-            if (command.ExitStatus != 0)
+
+            using (var command = client.CreateCommand("sudo pkill -9 -U sshnet -f sshd-session.pam"))
             {
-                throw new ApplicationException(
-                    $"Killing sshd.pam service failed with exit code {command.ExitStatus}.\r\n{output}\r\n{command.Error}");
+                var output = command.Execute();
+                if (command.ExitStatus != 0)
+                {
+                    throw new ApplicationException(
+                        $"Killing sshd-session.pam service failed with exit code {command.ExitStatus}.\r\n{output}\r\n{command.Error}");
+                }
             }
         }
     }

diff --git a/test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs b/test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs
@@ -75,14 +75,16 @@ public async Task DisposeAsync()
         {
             if (_sshServer != null)
             {
+#pragma warning disable S6966 // Awaitable method should be used
                 //try
                 //{
-                //    File.WriteAllBytes(@"C:\tmp\auth.log", await _sshServer.ReadFileAsync("/var/log/auth.log"));
+                //    File.WriteAllBytes(@"C:\tmp\auth.log", await _sshServer.ReadFileAsync("/var/log/auth.log").ConfigureAwait(false));
                 //}
                 //catch (Exception ex)
                 //{
                 //    Console.Error.WriteLine(ex.ToString());
                 //}
+#pragma warning restore S6966 // Awaitable method should be used
 
                 await _sshServer.DisposeAsync();
             }