Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public NodeFunctionalTests(NodeAppFixture nodeJsFixture)

[Fact]
[RequiresTools(["node"])]
[QuarantinedTest("https://github.com/dotnet/aspire/issues/4508")]
[ActiveIssue("https://github.com/dotnet/aspire/issues/4508", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningFromAzdo))]
public async Task VerifyNodeAppWorks()
{
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
Expand All @@ -30,7 +30,7 @@ public async Task VerifyNodeAppWorks()

[Fact]
[RequiresTools(["npm"])]
[QuarantinedTest("https://github.com/dotnet/aspire/issues/4508")]
[ActiveIssue("https://github.com/dotnet/aspire/issues/4508", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningFromAzdo))]
public async Task VerifyNpmAppWorks()
{
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));
Expand Down
10 changes: 5 additions & 5 deletions tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace Aspire.Hosting.Oracle.Tests;

[QuarantinedTest("https://github.com/dotnet/aspire/issues/5362")]
[ActiveIssue("https://github.com/dotnet/aspire/issues/5362", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningOnCI))]
public class OracleFunctionalTests(ITestOutputHelper testOutputHelper)
{
// Folders created for mounted folders need to be granted specific permissions
Expand All @@ -26,7 +26,7 @@ public class OracleFunctionalTests(ITestOutputHelper testOutputHelper)

private const string DatabaseReadyText = "Completed: ALTER DATABASE OPEN";

[Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
[Fact]
[RequiresDocker]
public async Task VerifyEfOracle()
{
Expand Down Expand Up @@ -67,7 +67,7 @@ public async Task VerifyEfOracle()
Assert.Equal("BatMobile", cars[0].Brand);
}

[Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
[Theory]
[InlineData(true)]
[InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5191")]
[RequiresDocker]
Expand Down Expand Up @@ -242,7 +242,7 @@ await pipeline.ExecuteAsync(async token =>
}
}

[Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
[Theory]
[InlineData(true)]
[InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5190")]
[RequiresDocker]
Expand Down Expand Up @@ -345,7 +345,7 @@ await pipeline.ExecuteAsync(async token =>
}
}

[Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
[Fact]
[RequiresDocker]
public async Task VerifyWaitForOnOracleBlocksDependentResources()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,7 @@ public async Task ProxylessEndpointWithoutPortThrows()
}

[Fact]
[QuarantinedTest("https://github.com/dotnet/aspire/issues/8728")]
public async Task ProxylessEndpointWorks()
{
const string testName = "proxyless-endpoint-works";
Expand Down
1 change: 1 addition & 0 deletions tests/Aspire.TestUtilities/PlatformDetection.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ public static class PlatformDetection
public static bool IsRunningOnHelix => Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null;
public static bool IsRunningOnGithubActions => Environment.GetEnvironmentVariable("GITHUB_JOB") is not null;
public static bool IsRunningOnCI => IsRunningOnAzdoBuildMachine || IsRunningOnHelix || IsRunningOnGithubActions;
public static bool IsRunningFromAzdo => IsRunningOnAzdoBuildMachine || IsRunningOnHelix;
public static bool IsRunningPRValidation => IsRunningOnGithubActions;

public static bool IsWindows => OperatingSystem.IsWindows();
Expand Down