Skip to content

Bump alpine from 3.20 to 3.21 in /test/Renci.SshNet.IntegrationTests #1567

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

Merged
merged 3 commits into from
Jan 3, 2025
Merged

Bump alpine from 3.20 to 3.21 in /test/Renci.SshNet.IntegrationTests #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
267317e
Bump alpine from 3.20 to 3.21 in /test/Renci.SshNet.IntegrationTests
dependabot[bot] Jan 3, 2025
7c9405f
Merge branch 'develop' into dependabot
Rob-Hague Jan 3, 2025
cb4f1b3
merge #1553
Rob-Hague Jan 3, 2025
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
2 changes: 1 addition & 1 deletion test/Renci.SshNet.IntegrationTests/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.20
FROM alpine:3.21

COPY --chown=root:root server/ssh /etc/ssh/
COPY --chown=root:root server/script /opt/sshnet
Expand Down
1 change: 0 additions & 1 deletion test/Renci.SshNet.IntegrationTests/KeyExchangeAlgorithmTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ public void TearDown()
}

[TestMethod]
[Ignore]
public void SNtruP761X25519Sha512()
{
_remoteSshdConfig.ClearKeyExchangeAlgorithms()
Expand Down
25 changes: 15 additions & 10 deletions test/Renci.SshNet.IntegrationTests/SshConnectionDisruptor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}");
}
}
}
}
Expand Down
4 changes: 3 additions & 1 deletion test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down