Skip to content
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

Jump to bottom

Include Integration tests in code coverage #147

Merged
merged 23 commits into from
Nov 5, 2021
Merged

Include Integration tests in code coverage #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2eb2837
use "Code Coverage"
lucyzhang929 Nov 1, 2021
dadc552
"Code Coverage" for pr pipeline
lucyzhang929 Nov 1, 2021
654af0d
update test sdk and remove coverlet
lucyzhang929 Nov 2, 2021
76e59f9
wait 30s for func host to start
lucyzhang929 Nov 2, 2021
14d5c07
increase wait time for queue trigger test
lucyzhang929 Nov 2, 2021
931e96f
decrease queue trigger wait time
lucyzhang929 Nov 2, 2021
1a83983
temp disable queue test
lucyzhang929 Nov 2, 2021
dd5a391
use .net core 3.1.0
lucyzhang929 Nov 2, 2021
92c262d
change task order
lucyzhang929 Nov 2, 2021
bafbf68
skip integration tests temporarily
lucyzhang929 Nov 3, 2021
31e4a46
update to .net 5
lucyzhang929 Nov 3, 2021
d17e817
use .net 3.1 for azure functions
lucyzhang929 Nov 3, 2021
7be9d82
add settings file
lucyzhang929 Nov 3, 2021
968bb47
update pr pipeline
lucyzhang929 Nov 3, 2021
699b7ea
fix runsettings file
lucyzhang929 Nov 3, 2021
193990f
edit runsettings file
lucyzhang929 Nov 4, 2021
5e4cab7
add code coverage package
lucyzhang929 Nov 4, 2021
01c1efe
add split coverage setting
lucyzhang929 Nov 4, 2021
a8d06ed
reenable queue test
lucyzhang929 Nov 4, 2021
4923f01
decrease func host wait time
lucyzhang929 Nov 4, 2021
f981b0d
add cobertura format + pr comment
lucyzhang929 Nov 5, 2021
92349c1
publish code coverage results
lucyzhang929 Nov 5, 2021
3c607e0
revert back to split coverage
lucyzhang929 Nov 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 7 additions & 8 deletions builds/azure-pipelines/template-steps-build-test-linux.yml
View file
Open in desktop
Expand Up @@ -6,7 +6,12 @@ parameters:

steps:
- task: UseDotNet@2
displayName: 'Install .NET Core SDK 3.1.x for Build'
displayName: 'Install .NET Core SDK 5.0.x for Running Tests'
inputs:
version: '5.0.x'

- task: UseDotNet@2
displayName: 'Install .NET Core 3.1 SDK for Azure Functions Build'
inputs:
version: '3.1.x'

Expand Down Expand Up @@ -131,13 +136,7 @@ steps:
inputs:
command: test
projects: '${{ parameters.solution }}'
arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=$(Build.ArtifactStagingDirectory)\TestResults\coverage\ /p:Exclude="[*]Microsoft.Azure.WebJobs.Extensions.Sql.Samples.*"'

- task: PublishCodeCoverageResults@1
displayName: 'Publish Code Coverage Results'
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(Build.ArtifactStagingDirectory)/TestResults/coverage/coverage.cobertura.xml'
arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings'

- script: |
docker stop sql1
Expand Down
8 changes: 1 addition & 7 deletions builds/azure-pipelines/template-steps-build-test.yml
View file
Open in desktop
Expand Up @@ -127,10 +127,4 @@ steps:
inputs:
command: test
projects: '${{ parameters.solution }}'
arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} /p:CollectCoverage=true /p:CoverletOutputFormat=cobertura /p:CoverletOutput=$(Build.ArtifactStagingDirectory)\TestResults\coverage\ /p:Exclude="[*]Microsoft.Azure.WebJobs.Extensions.Sql.Samples.*"'

- task: PublishCodeCoverageResults@1
displayName: 'Publish Code Coverage Results'
inputs:
codeCoverageTool: Cobertura
summaryFileLocation: '$(Build.ArtifactStagingDirectory)\TestResults\coverage\coverage.cobertura.xml'
arguments: '--configuration ${{ parameters.configuration }} ${{ parameters.testFilter }} --collect "Code Coverage" -s $(Build.SourcesDirectory)/test/coverage.runsettings'
2 changes: 1 addition & 1 deletion test/Integration/IntegrationTestBase.cs
View file
Open in desktop
Expand Up @@ -181,7 +181,7 @@ protected void StartFunctionHost(string functionName, bool useTestFolder = false
this.FunctionHost.BeginOutputReadLine();
this.FunctionHost.BeginErrorReadLine();

Thread.Sleep(5000); // This is just to give some time to func host to start, maybe there's a better way to do this (check if port's open?)
Thread.Sleep(10000); // This is just to give some time to func host to start, maybe there's a better way to do this (check if port's open?)
}

private string GetFunctionsCoreToolsPath()
Expand Down
4 changes: 1 addition & 3 deletions test/Microsoft.Azure.WebJobs.Extensions.Sql.Tests.csproj
View file
Open in desktop
Expand Up @@ -7,12 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
<PackageReference Include="Moq" Version="4.14.3" />
<PackageReference Include="xunit" Version="2.4.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
<PackageReference Include="coverlet.collector" Version="1.2.0" />
<PackageReference Include="coverlet.msbuild" Version="2.9.0" />
<PackageReference Include="Microsoft.NET.Sdk.Functions" Version="3.0.13" />
</ItemGroup>

Expand Down
19 changes: 19 additions & 0 deletions test/coverage.runsettings
View file
Open in desktop
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RunSettings>
<DataCollectionRunSettings>
<DataCollectors>
<DataCollector friendlyName="Code Coverage" uri="datacollector://Microsoft/CodeCoverage/2.0" assemblyQualifiedName="Microsoft.VisualStudio.Coverage.DynamicCoverageDataCollector, Microsoft.VisualStudio.TraceCollector, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<Configuration>
<SplitCoverage>True</SplitCoverage>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does SplitCoverage mean?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

SplitCoverage is so that we can see the Code Coverage tab in ADO.
More details from this comment here: microsoft/vstest#981 (comment)

<CodeCoverage>
<ModulePaths>
<Include>
<ModulePath>.*\Microsoft.Azure.WebJobs.Extensions.Sql.dll$</ModulePath>
</Include>
</ModulePaths>
</CodeCoverage>
</Configuration>
</DataCollector>
</DataCollectors>
</DataCollectionRunSettings>
</RunSettings>