Skip to content

Commit f0f8dd5

Browse files
authored
Fixed issue that test coverage warning status overrode the test failed status (#21762)
1 parent 09530df commit f0f8dd5

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

tools/ExecuteCIStep.ps1

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,12 @@ Param(
8484
$CIPlanPath = "$RepoArtifacts/PipelineResult/CIPlan.json"
8585
$PipelineResultPath = "$RepoArtifacts/PipelineResult/PipelineResult.json"
8686

87+
$testResults = @{
88+
Succeeded = 1
89+
Warning = 10
90+
Failed = 100
91+
}
92+
8793
Function Get-PlatformInfo
8894
{
8995
If ($IsWindows)
@@ -134,8 +140,10 @@ Function Set-ModuleTestStatusInPipelineResult
134140
{
135141
If ($ModuleInfo.Module -Eq $ModuleName)
136142
{
137-
$ModuleInfo.Status = $Status
138-
$ModuleInfo.Content = $Content
143+
if ([string]::IsNullOrWhiteSpace($ModuleInfo.Status) -or $testResults[$ModuleInfo.Status] -lt $testResults[$Status]) {
144+
$ModuleInfo.Status = $Status
145+
$ModuleInfo.Content = $Content
146+
}
139147
}
140148
}
141149
ConvertTo-Json -Depth 10 -InputObject $PipelineResult | Out-File -FilePath $PipelineResultPath
@@ -315,7 +323,7 @@ If ($TestAutorest)
315323
If ($Test -And (($CIPlan.test.Length -Ne 0) -Or ($PSBoundParameters.ContainsKey("TargetModule"))))
316324
{
317325
dotnet test $RepoArtifacts/Azure.PowerShell.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $Configuration --framework $TestFramework --logger trx --results-directory $TestOutputDirectory
318-
326+
319327
$TestResultFiles = Get-ChildItem "$RepoArtifacts/TestResults/" -Filter *.trx
320328
$FailedTestCases = @{}
321329
Foreach ($TestResultFile in $TestResultFiles)
@@ -356,7 +364,7 @@ If ($Test -And (($CIPlan.test.Length -Ne 0) -Or ($PSBoundParameters.ContainsKey(
356364
Set-ModuleTestStatusInPipelineResult -ModuleName $ModuleInfo.Module -Status $Status
357365
}
358366
}
359-
367+
360368
If ($FailedTestCases.Length -ne 0)
361369
{
362370
Return -1
@@ -493,4 +501,4 @@ If ($StaticAnalysisCmdletDiff)
493501
dotnet $RepoArtifacts/StaticAnalysis/StaticAnalysis.Netcore.dll -p $RepoArtifacts/$Configuration -r $StaticAnalysisOutputDirectory --analyzers cmdlet-diff -u -m $CmdletDiffModuleList
494502
}
495503
Return
496-
}
504+
}

0 commit comments

Comments
 (0)