Skip to content

Commit acc885c

Browse files
authored
[tests] Disable some Quarantined tests (#8723)
* [tests] Use ActiveIssue for Hosting.NodeJs.Tests These tests work as expected except on azdo build machines, or helix where node/npm is not installed. So, instead of Quarantining these tests use `ActiveIssue` to specifically disable them on Azdo. * [tests] Use ActiveIssue for OracleFunctionalTests According to the issue these tests are not flaky, so use `ActiveIssue`. Issue: #4508 * Quarantine Aspire.Hosting.Tests.DistributedApplicationTests.ProxylessEndpointWorks
1 parent 3f9e7d2 commit acc885c

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

tests/Aspire.Hosting.NodeJs.Tests/NodeFunctionalTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public NodeFunctionalTests(NodeAppFixture nodeJsFixture)
1818

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

3131
[Fact]
3232
[RequiresTools(["npm"])]
33-
[QuarantinedTest("https://github.com/dotnet/aspire/issues/4508")]
33+
[ActiveIssue("https://github.com/dotnet/aspire/issues/4508", typeof(PlatformDetection), nameof(PlatformDetection.IsRunningFromAzdo))]
3434
public async Task VerifyNpmAppWorks()
3535
{
3636
using var cts = new CancellationTokenSource(TimeSpan.FromMinutes(1));

tests/Aspire.Hosting.Oracle.Tests/OracleFunctionalTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
namespace Aspire.Hosting.Oracle.Tests;
1616

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

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

29-
[Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
29+
[Fact]
3030
[RequiresDocker]
3131
public async Task VerifyEfOracle()
3232
{
@@ -67,7 +67,7 @@ public async Task VerifyEfOracle()
6767
Assert.Equal("BatMobile", cars[0].Brand);
6868
}
6969

70-
[Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
70+
[Theory]
7171
[InlineData(true)]
7272
[InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5191")]
7373
[RequiresDocker]
@@ -242,7 +242,7 @@ await pipeline.ExecuteAsync(async token =>
242242
}
243243
}
244244

245-
[Theory(Skip = "https://github.com/dotnet/aspire/issues/5362")]
245+
[Theory]
246246
[InlineData(true)]
247247
[InlineData(false, Skip = "https://github.com/dotnet/aspire/issues/5190")]
248248
[RequiresDocker]
@@ -345,7 +345,7 @@ await pipeline.ExecuteAsync(async token =>
345345
}
346346
}
347347

348-
[Fact(Skip = "https://github.com/dotnet/aspire/issues/5362")]
348+
[Fact]
349349
[RequiresDocker]
350350
public async Task VerifyWaitForOnOracleBlocksDependentResources()
351351
{

tests/Aspire.Hosting.Tests/DistributedApplicationTests.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@ public async Task ProxylessEndpointWithoutPortThrows()
914914
}
915915

916916
[Fact]
917+
[QuarantinedTest("https://github.com/dotnet/aspire/issues/8728")]
917918
public async Task ProxylessEndpointWorks()
918919
{
919920
const string testName = "proxyless-endpoint-works";

tests/Aspire.TestUtilities/PlatformDetection.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ public static class PlatformDetection
99
public static bool IsRunningOnHelix => Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null;
1010
public static bool IsRunningOnGithubActions => Environment.GetEnvironmentVariable("GITHUB_JOB") is not null;
1111
public static bool IsRunningOnCI => IsRunningOnAzdoBuildMachine || IsRunningOnHelix || IsRunningOnGithubActions;
12+
public static bool IsRunningFromAzdo => IsRunningOnAzdoBuildMachine || IsRunningOnHelix;
1213
public static bool IsRunningPRValidation => IsRunningOnGithubActions;
1314

1415
public static bool IsWindows => OperatingSystem.IsWindows();

0 commit comments

Comments
 (0)