Skip to content

Commit 8971520

Browse files
committed
Revert "integration test"
This reverts commit 3269626.
1 parent 3269626 commit 8971520

File tree

2 files changed

+5
-20
lines changed

2 files changed

+5
-20
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -128,18 +128,6 @@ jobs:
128128
podman build -t renci-ssh-tests-server-image -f test/Renci.SshNet.IntegrationTests/Dockerfile test/Renci.SshNet.IntegrationTests/
129129
podman run --rm -h renci-ssh-tests-server -d -p 2222:22 renci-ssh-tests-server-image
130130
131-
- name: Run Integration Tests .NET
132-
run:
133-
dotnet test `
134-
-f net9.0 `
135-
--logger "console;verbosity=normal" `
136-
--logger GitHubActions `
137-
--filter "Name~Curve25519|Name~X25519" `
138-
-p:CollectCoverage=true `
139-
-p:CoverletOutputFormat=cobertura `
140-
-p:CoverletOutput=..\..\coverlet\windows_integration_test_net_9_coverage.xml `
141-
test\Renci.SshNet.IntegrationTests\
142-
143131
- name: Run Integration Tests .NET Framework
144132
run:
145133
dotnet test `

test/Renci.SshNet.IntegrationTests/TestsFixtures/InfrastructureFixture.cs

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
using System.Runtime.InteropServices;
2-
3-
using DotNet.Testcontainers.Builders;
1+
using DotNet.Testcontainers.Builders;
42
using DotNet.Testcontainers.Containers;
53
using DotNet.Testcontainers.Images;
64

@@ -40,17 +38,16 @@ private InfrastructureFixture()
4038

4139
public async Task InitializeAsync()
4240
{
43-
#pragma warning disable MA0144 // use System.OperatingSystem to check the current OS
44-
// for the Windows Tests in CI, the Container is set up in WSL2 with Podman
45-
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
46-
Environment.GetEnvironmentVariable("CI") == "true")
47-
#pragma warning restore MA0144 // use System.OperatingSystem to check the current OS
41+
// for the .NET Framework Tests in CI, the Container is set up in WSL2 with Podman
42+
#if NETFRAMEWORK
43+
if (Environment.GetEnvironmentVariable("CI") == "true")
4844
{
4945
SshServerPort = 2222;
5046
SshServerHostName = "localhost";
5147
await Task.Delay(1_000);
5248
return;
5349
}
50+
#endif
5451

5552
var containerLogger = _loggerFactory.CreateLogger("testcontainers");
5653

0 commit comments

Comments
 (0)