Skip to content

Commit 42232dd

Browse files
committed
Fix tests
1 parent e08e36e commit 42232dd

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.github/workflows/tests-runner.yml

+3
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ jobs:
121121
sudo apt-get install -y azure-functions-core-tools-4
122122
123123
- name: Test ${{ matrix.tests.project }}
124+
env:
125+
CI: false
124126
run: |
125127
${{ matrix.tests.command }}
126128
@@ -184,6 +186,7 @@ jobs:
184186
185187
- name: Test ${{ matrix.tests.project }}
186188
env:
189+
CI: false
187190
BUILT_NUGETS_PATH: ${{ github.workspace }}/artifacts/packages/Release/Shipping
188191
run: |
189192
${{ matrix.tests.command }}

eng/TestRunsheetBuilder/TestRunsheetBuilder.targets

+6-2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@
3838
<_CreateRunsheet Condition=" '$(_RequiresPackages)' != 'true' and '$(FullE2e)' != 'true' ">true</_CreateRunsheet>
3939

4040
<_CreateRunsheet Condition=" '$(MSBuildProjectName)' == 'Aspire.Templates.Tests' ">false</_CreateRunsheet>
41+
42+
<!-- FIXME: temporary workaround for https://github.com/Azure/azure-functions-dotnet-worker/issues/2969 -->
43+
<_PreCommand Condition=" '$(MSBuildProjectName)' == 'Aspire.Playground.Tests' ">./dotnet.sh build &quot;%24(pwd)/playground/AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/AzureFunctionsEndToEnd.Functions.csproj&quot; -c $(Configuration) /p:SkipUnstableEmulators=true &amp;&amp; </_PreCommand>
4144
</PropertyGroup>
4245

4346
<PropertyGroup>
@@ -59,16 +62,17 @@
5962

6063
<_TestRunnerWindows>./eng/build.ps1</_TestRunnerWindows>
6164
<_TestRunnerLinux>./eng/build.sh</_TestRunnerLinux>
62-
<_TestCommand>-restore -build -test -projects &quot;$(_RelativeTestProjectPath)&quot; /bl:&quot;$(_RelativeTestBinLog)&quot; -c $(Configuration) -ci /p:CI=false</_TestCommand>
65+
<_TestCommand>-restore -build -test -projects &quot;$(_RelativeTestProjectPath)&quot; /bl:&quot;$(_RelativeTestBinLog)&quot; -c $(Configuration) -ci</_TestCommand>
6366

6467
<!-- Tests requiring packages must be run in the "out of repo" mode -->
6568
<_TestCommand Condition=" '$(_RequiresPackages)' == 'true' ">$(_TestCommand) /p:TestsRunningOutsideOfRepo=true</_TestCommand>
6669

6770
<!-- Replace \ with /, and then escape " with \", so we have a compliant JSON -->
71+
<_PreCommand>$([System.String]::Copy($(_PreCommand)).Replace("\", "/").Replace('&quot;', '\&quot;'))</_PreCommand>
6872
<_TestCommand>$([System.String]::Copy($(_TestCommand)).Replace("\", "/").Replace('&quot;', '\&quot;'))</_TestCommand>
6973

7074
<_TestRunsheetWindows>{ "project": "$(_TestRunsheet)", "os": "windows-latest", "command": "./eng/build.ps1 $(_TestCommand)" }</_TestRunsheetWindows>
71-
<_TestRunsheetLinux>{ "project": "$(_TestRunsheet)", "os": "ubuntu-latest", "command": "./eng/build.sh $(_TestCommand)" }</_TestRunsheetLinux>
75+
<_TestRunsheetLinux>{ "project": "$(_TestRunsheet)", "os": "ubuntu-latest", "command": "$(_PreCommand)./eng/build.sh $(_TestCommand)" }</_TestRunsheetLinux>
7276
</PropertyGroup>
7377

7478
<ItemGroup>

tests/Aspire.Playground.Tests/Aspire.Playground.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
<ItemGroup>
7070
<ProjectReference Include="$(PlaygroundSourceDir)AspireEventHub/EventHubs.AppHost/EventHubs.AppHost.csproj" />
7171
<ProjectReference Include="$(PlaygroundSourceDir)AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.AppHost/AzureFunctionsEndToEnd.AppHost.csproj" />
72+
<ProjectReference Include="$(PlaygroundSourceDir)AzureFunctionsEndToEnd/AzureFunctionsEndToEnd.Functions/AzureFunctionsEndToEnd.Functions.csproj" />
7273
<ProjectReference Include="$(PlaygroundSourceDir)AzureStorageEndToEnd/AzureStorageEndToEnd.AppHost/AzureStorageEndToEnd.AppHost.csproj" />
7374
<ProjectReference Include="$(PlaygroundSourceDir)CosmosEndToEnd/CosmosEndToEnd.AppHost/CosmosEndToEnd.AppHost.csproj" />
7475
<ProjectReference Include="$(PlaygroundSourceDir)kafka/KafkaBasic.AppHost/KafkaBasic.AppHost.csproj" />

0 commit comments

Comments
 (0)