Skip to content

Fix PSVersionTable tag GitCommitId test #27523

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

Open
KirtiRamchandani wants to merge 1 commit into
base: master
Choose a base branch
from
+33 −16
Open

Fix PSVersionTable tag GitCommitId test #27523

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
49 changes: 33 additions & 16 deletions test/powershell/Host/PSVersionTable.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,32 @@ Describe "PSVersionTable" -Tags "CI" {
$sma = Get-Item (Join-Path $PSHOME "System.Management.Automation.dll")
$formattedVersion = $sma.VersionInfo.ProductVersion

$mainVersionPattern = "(\d+\.\d+\.\d+)(-.+)?"
$fullVersionPattern = "^(\d+\.\d+\.\d+)(-.+)?-(\d+)-g(.+)$"
function Get-ExpectedGitCommitIds
{
param([string]$ProductVersion)

$expectedPSVersion = ($formattedVersion -split " ")[0]
$expectedVersionPattern = "^$mainVersionPattern$"
$versionAndSha = $ProductVersion -split " SHA: ", 2
$version = $versionAndSha[0]
$sourceRevision = if ($versionAndSha.Count -eq 2) { ($versionAndSha[1] -split "\+", 2)[0] } else { $null }

if ($formattedVersion.Contains(" Commits: "))
{
$rawGitCommitId = $formattedVersion.Replace(" Commits: ", "-").Replace(" SHA: ", "-g")
$expectedGitCommitIdPattern = $fullVersionPattern
$unexpectectGitCommitIdPattern = "qwerty"
} else {
$rawGitCommitId = ($formattedVersion -split " SHA: ")[0]
$expectedGitCommitIdPattern = "^$mainVersionPattern$"
$unexpectectGitCommitIdPattern = $fullVersionPattern
if ($ProductVersion.Contains(" Commits: "))
{
return @($version.Replace(" Commits: ", "-") + "-g$sourceRevision")
}

$expectedGitCommitIds = @($version)
if ($null -ne $sourceRevision)
{
$expectedGitCommitIds += "$version-0-g$sourceRevision"
}

return $expectedGitCommitIds
}

$mainVersionPattern = "(\d+\.\d+\.\d+)(-.+)?"
$expectedPSVersion = ($formattedVersion -split " ")[0]
$expectedVersionPattern = "^$mainVersionPattern$"
$expectedGitCommitIds = Get-ExpectedGitCommitIds -ProductVersion $formattedVersion
}

It "Should have version table entries" {
Expand Down Expand Up @@ -51,9 +61,16 @@ Describe "PSVersionTable" -Tags "CI" {

It "GitCommitId property" {
$PSVersionTable.GitCommitId | Should -BeOfType System.String
$PSVersionTable.GitCommitId | Should -Match $expectedGitCommitIdPattern
$PSVersionTable.GitCommitId | Should -Not -Match $unexpectectGitCommitIdPattern
$PSVersionTable.GitCommitId | Should -BeExactly $rawGitCommitId
$expectedGitCommitIds.Contains($PSVersionTable.GitCommitId) | Should -BeTrue
}

It "GitCommitId property accepts tag builds with zero commits" {
$expected = @(
"7.6.2"
"7.6.2-0-g0d3c290a8737d4252ee75c052d16190ffcdb7d19"
)
$actual = Get-ExpectedGitCommitIds -ProductVersion "7.6.2 SHA: 0d3c290a8737d4252ee75c052d16190ffcdb7d19"
Compare-Object -ReferenceObject $expected -DifferenceObject $actual | Should -Be $null
}

It "Should have the correct platform info" {
Expand Down