Skip to content

Commit 857aad5

Browse files
committed
Use port 8800 for Cosmos emulator on Helix
Don't skip tests if emulator not available
1 parent 79c8ce7 commit 857aad5

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

.github/workflows/TestCosmos.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ jobs:
3434
- name: Test on Cosmos
3535
run: dotnet test test/EFCore.Cosmos.FunctionalTests/EFCore.Cosmos.FunctionalTests.csproj
3636
shell: cmd
37+
env:
38+
Test__Cosmos__SkipConnectionCheck: true
3739

3840
- name: Publish Test Results
3941
uses: actions/upload-artifact@v7

eng/helix.proj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,12 @@
1313
<EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
1414
<FailOnTestFailure>true</FailOnTestFailure>
1515
<SqlServerTests>$(RepoRoot)/test/EFCore.SqlServer.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.SqlServer.HierarchyId.Tests/*.csproj;$(RepoRoot)/test/EFCore.OData.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.AspNet.SqlServer.FunctionalTests/*.csproj;$(RepoRoot)/test/EFCore.VisualBasic.FunctionalTests/*.vbproj;$(RepoRoot)/test/EFCore.FSharp.FunctionalTests/*.fsproj</SqlServerTests>
16+
<CosmosTests>$(RepoRoot)/test/EFCore.Cosmos.FunctionalTests/*.csproj;</CosmosTests>
1617
</PropertyGroup>
1718

1819
<PropertyGroup Condition = "'$(SYSTEM_ACCESSTOKEN)' == ''">
1920
<!-- Local build outside of Azure Pipeline -->
20-
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.XL.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues>
21+
<HelixTargetQueues Condition = "'$(HelixTargetQueues)' == ''">Windows.10.Amd64.XL.Open;OSX.1200.Amd64.Open;OSX.1200.ARM64.Open;Ubuntu.2204.Amd64.XL.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64</HelixTargetQueues>
2122
<EnableAzurePipelinesReporter>false</EnableAzurePipelinesReporter>
2223
<HelixSource>efcore/localbuild/</HelixSource>
2324
<HelixBuild>t001</HelixBuild>
@@ -72,7 +73,14 @@
7273
<!-- Remove test projects which requires SqlServer from Ubuntu/OSX. -->
7374
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`OSX`))' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL.Open' OR '$(HelixTargetQueue)' == 'Ubuntu.2204.Amd64.XL'">
7475
<XUnitProject Remove="$(SqlServerTests)"/>
75-
</ItemGroup>
76+
</ItemGroup>
77+
78+
<!-- Set Cosmos emulator connection on Windows -->
79+
<ItemGroup Condition = "'$(HelixTargetQueue.StartsWith(`Windows`))'">
80+
<XUnitProject Update="$(CosmosTests)">
81+
<PreCommands>$(PreCommands);set Test__Cosmos__SkipConnectionCheck=true;set Test__Cosmos__DefaultConnection=https://localhost:8800</PreCommands>
82+
</XUnitProject>
83+
</ItemGroup>
7684

7785
<PropertyGroup>
7886
<XUnitPublishTargetFramework>$(NetCurrent)</XUnitPublishTargetFramework>

test/EFCore.Cosmos.FunctionalTests/TestUtilities/CosmosTestStore.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,11 @@ public override DbContextOptionsBuilder AddProviderOptions(DbContextOptionsBuild
9696

9797
public static async ValueTask<bool> IsConnectionAvailableAsync()
9898
{
99+
if (TestEnvironment.SkipConnectionCheck)
100+
{
101+
return true;
102+
}
103+
99104
if (_connectionAvailable == null)
100105
{
101106
await _connectionSemaphore.WaitAsync();

test/EFCore.Cosmos.FunctionalTests/TestUtilities/TestEnvironment.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,4 +46,6 @@ public static class TestEnvironment
4646
: Enum.Parse<AzureLocation>(Config["AzureLocation"]);
4747

4848
public static bool IsEmulator { get; } = !UseTokenCredential && (AuthToken == _emulatorAuthToken);
49+
50+
public static bool SkipConnectionCheck { get; } = Config["SkipConnectionCheck"] == "true";
4951
}

0 commit comments

Comments
 (0)