Skip to content

Make test file result names unique #8979

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
Travis Plunk (TravisEz13) merged 2 commits into from
Feb 25, 2019
Merged

Make test file result names unique #8979

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cd6c61
remove no-op function
TravisEz13 Feb 25, 2019
1bb1c57
Make test result file names unique per TagSet
TravisEz13 Feb 25, 2019
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
29 changes: 2 additions & 27 deletions tools/ci.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,20 +262,6 @@ function Invoke-CIInstall
Start-PSBootstrap -Confirm:$false
}

# A wrapper to ensure that we upload test results
# and that if we are not able to that it does not fail
# the CI build
function Update-TestResults
{
param(
[string] $resultsFile
)
if(!$pushedResults)
{
Write-Warning "Failed to push all artifacts for $resultsFile"
}
}

function Invoke-CIxUnit
{
param(
Expand All @@ -291,8 +277,6 @@ function Invoke-CIxUnit
$xUnitTestResultsFile = "$pwd\xUnitTestResults.xml"

Start-PSxUnit -xUnitTestResultsFile $xUnitTestResultsFile
Write-Host -ForegroundColor Green 'Uploading PSxUnit test results'
Update-TestResults -resultsFile $xUnitTestResultsFile
Push-Artifact -Path $xUnitTestResultsFile -name xunit

if(!$SkipFailing.IsPresent)
Expand All @@ -316,8 +300,8 @@ function Invoke-CITest

$env:CoreOutput = Split-Path -Parent (Get-PSOutput -Options (Get-PSOptions))
Write-Host -Foreground Green 'Run CoreCLR tests'
$testResultsNonAdminFile = "$pwd\TestsResultsNonAdmin.xml"
$testResultsAdminFile = "$pwd\TestsResultsAdmin.xml"
$testResultsNonAdminFile = "$pwd\TestsResultsNonAdmin-$TagSet.xml"
$testResultsAdminFile = "$pwd\TestsResultsAdmin-$TagSet.xml"
if(!(Test-Path "$env:CoreOutput\pwsh.exe"))
{
throw "CoreCLR pwsh.exe was not built"
Expand Down Expand Up @@ -353,8 +337,6 @@ function Invoke-CITest
ExcludeTag = $ExcludeTag + 'RequireAdminOnWindows'
}
Start-PSPester @arguments -Title "Pester Unelevated - $TagSet"
Write-Host -Foreground Green 'Upload CoreCLR Non-Admin test results'
Update-TestResults -resultsFile $testResultsNonAdminFile
# Fail the build, if tests failed
Test-PSPesterResults -TestResultsFile $testResultsNonAdminFile

Expand All @@ -377,8 +359,6 @@ function Invoke-CITest
}
Start-PSPester @arguments -Title "Pester Experimental Unelevated - $featureName"

Write-Host -ForegroundColor Green "Upload CoreCLR Non-Admin test results for experimental feature '$featureName'"
Update-TestResults -resultsFile $expFeatureTestResultFile
# Fail the build, if tests failed
Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
}
Expand All @@ -393,9 +373,6 @@ function Invoke-CITest
ExcludeTag = $ExcludeTag
}
Start-PSPester @arguments -Title "Pester Elevated - $TagSet"
Write-Host -Foreground Green 'Upload CoreCLR Admin test results'
Update-TestResults -resultsFile $testResultsAdminFile


# Fail the build, if tests failed
Test-PSPesterResults -TestResultsFile $testResultsAdminFile
Expand All @@ -422,8 +399,6 @@ function Invoke-CITest
}
Start-PSPester @arguments -Title "Pester Experimental Elevated - $featureName"

Write-Host -ForegroundColor Green "Upload CoreCLR Admin test results for experimental feature '$featureName'"
Update-TestResults -resultsFile $expFeatureTestResultFile
# Fail the build, if tests failed
Test-PSPesterResults -TestResultsFile $expFeatureTestResultFile
}
Expand Down