Skip to content

Skip two failing tests and add SkipOnHelixCondition attribute #38203

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
AndriySvyryd merged 3 commits into from
May 1, 2026
Merged

Skip two failing tests and add SkipOnHelixCondition attribute #38203

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
6c46a2b
Skip SDK-dependent tests on Helix
AndriySvyryd May 1, 2026
922b688
Skip SDK-dependent tests on Helix with SkipOnHelixCondition
AndriySvyryd May 1, 2026
004f490
Rename 'Validate Job Results' to 'Job Results' in pipelines
AndriySvyryd May 1, 2026
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 azure-pipelines-internal-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -623,7 +623,7 @@ extends:
condition: always()
jobs:
- job: Validate_Job_Results
displayName: Validate Job Results
displayName: Job Results
pool:
name: $(DncEngInternalBuildPool)
demands: ImageOverride -equals 1es-windows-2022
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines-public.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ stages:
condition: always()
jobs:
- job: Validate_Job_Results
displayName: Validate Job Results
displayName: Job Results
pool:
name: $(DncEngPublicBuildPool)
demands: ImageOverride -equals 1es-windows-2022-open
Expand Down
13 changes: 13 additions & 0 deletions test/EFCore.Specification.Tests/TestUtilities/Xunit/SkipOnHelixConditionAttribute.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.

namespace Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

[AttributeUsage(AttributeTargets.Method | AttributeTargets.Class | AttributeTargets.Assembly)]
public sealed class SkipOnHelixConditionAttribute : Attribute, ITestCondition
{
public ValueTask<bool> IsMetAsync()
=> new(Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is null);

public string SkipReason { get; set; } = "Test does not run on Helix.";
}
10 changes: 4 additions & 6 deletions .../EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyCollectionTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyCollectionTypeTest(SqlServerGeographyCollectionTypeTest.GeographyCollectionTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions .../EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyLineStringTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyLineStringTypeTest(
Expand Down Expand Up @@ -169,15 +171,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions ...re.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiLineStringTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyMultiLineStringTypeTest(
Expand Down Expand Up @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions .../EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPointTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyMultiPointTypeTest(SqlServerGeographyMultiPointTypeTest.MultiPointTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions ...FCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyMultiPolygonTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyMultiPolygonTypeTest(
Expand Down Expand Up @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPointTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyPointTypeTest(SqlServerGeographyPointTypeTest.PointTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geography/SqlServerGeographyPolygonTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geography;

public class SqlServerGeographyPolygonTypeTest(SqlServerGeographyPolygonTypeTest.PolygonTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryCollectionTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryCollectionTypeTest(SqlServerGeometryCollectionTypeTest.GeometryCollectionTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryLineStringTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryLineStringTypeTest(
Expand Down Expand Up @@ -169,15 +171,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions ...Core.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiLineStringTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryMultiLineStringTypeTest(
Expand Down Expand Up @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPointTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryMultiPointTypeTest(SqlServerGeometryMultiPointTypeTest.MultiPointTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -175,15 +177,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions .../EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryMultiPolygonTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryMultiPolygonTypeTest(
Expand Down Expand Up @@ -173,15 +175,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
10 changes: 4 additions & 6 deletions test/EFCore.SqlServer.FunctionalTests/Types/Geometry/SqlServerGeometryPointTypeTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

using NetTopologySuite.Geometries;

using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;

namespace Microsoft.EntityFrameworkCore.Types.Geometry;

public class SqlServerGeometryPointTypeTest(SqlServerGeometryPointTypeTest.PointTypeFixture fixture, ITestOutputHelper testOutputHelper)
Expand Down Expand Up @@ -167,15 +169,11 @@ FROM [JsonTypeEntity] AS [j]
}
}

// TODO: Currently failing on Helix only, see #36746
[SqlServerCondition(SqlServerCondition.SupportsFunctions2022)]
[SkipOnHelixCondition]
public override async Task ExecuteUpdate_within_json_to_nonjson_column()
{
// TODO: Currently failing on Helix only, see #36746
if (Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT") is not null)
{
return;
}

await base.ExecuteUpdate_within_json_to_nonjson_column();

if (Fixture.UsingJsonType)
Expand Down
Loading
Loading