From d35c3727134a8c8e424a16d96e4830c4cc9191ce Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 12 Jan 2018 16:32:31 -0800 Subject: [PATCH 1/2] fix version test to allow not to have a pre-release portion. --- test/powershell/Host/PSVersionTable.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/powershell/Host/PSVersionTable.Tests.ps1 b/test/powershell/Host/PSVersionTable.Tests.ps1 index d9ae1f863a4..25bde2a53ca 100644 --- a/test/powershell/Host/PSVersionTable.Tests.ps1 +++ b/test/powershell/Host/PSVersionTable.Tests.ps1 @@ -5,7 +5,7 @@ Describe "PSVersionTable" -Tags "CI" { $formattedVersion = $sma.VersionInfo.ProductVersion $mainVersionPattern = "(\d+\.\d+\.\d+)(-.+)?" - $fullVersionPattern = "^v(\d+\.\d+\.\d+)-(.+)-(\d+)-g(.+)$" + $fullVersionPattern = "v(\d+\.\d+\.\d+)(-(.+))?-(\d+)-g(.+)$" $expectedPSVersion = ($formattedVersion -split " ")[0] $expectedVersionPattern = "^$mainVersionPattern$" From 7b81ce156543e225d7267d7677f642db7c2c8276 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Fri, 12 Jan 2018 16:58:07 -0800 Subject: [PATCH 2/2] address PR feedback --- test/powershell/Host/PSVersionTable.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/powershell/Host/PSVersionTable.Tests.ps1 b/test/powershell/Host/PSVersionTable.Tests.ps1 index 25bde2a53ca..587867b2fb3 100644 --- a/test/powershell/Host/PSVersionTable.Tests.ps1 +++ b/test/powershell/Host/PSVersionTable.Tests.ps1 @@ -5,7 +5,7 @@ Describe "PSVersionTable" -Tags "CI" { $formattedVersion = $sma.VersionInfo.ProductVersion $mainVersionPattern = "(\d+\.\d+\.\d+)(-.+)?" - $fullVersionPattern = "v(\d+\.\d+\.\d+)(-(.+))?-(\d+)-g(.+)$" + $fullVersionPattern = "^v(\d+\.\d+\.\d+)(-.+)?-(\d+)-g(.+)$" $expectedPSVersion = ($formattedVersion -split " ")[0] $expectedVersionPattern = "^$mainVersionPattern$"