Update Canary.Tests.ps1

KirtiWandhare · web-flow · commit 4b28bac7546c · 2017-03-07T15:51:44.000-08:00
diff --git a/CanaryValidator/Canary.Tests.ps1 b/CanaryValidator/Canary.Tests.ps1
@@ -28,7 +28,7 @@ param (
     [parameter(HelpMessage="Local path where the windows ISO is stored")]
     [Parameter(ParameterSetName="default", Mandatory=$false)]
     [Parameter(ParameterSetName="tenant", Mandatory=$false)]
-    [ValidateNotNullOrEmpty()]
+    [ValidateScript({Test-Path -Path $_})]
     [string]$WindowsISOPath, 
     [parameter(HelpMessage="Fully qualified domain name of the azure stack environment. Ex: contoso.com")]
     [Parameter(ParameterSetName="default", Mandatory=$false)]
@@ -150,7 +150,7 @@ while ($runCount -le $NumberOfIterations)
         }
     }
 
-    if ($WindowsISOPath -and (Test-Path -Path $WindowsISOPath))
+    if ($WindowsISOPath)
     {
         Invoke-Usecase -Name 'UploadWindows2016ImageToPIR' -Description "Uploads a windows server 2016 image to the PIR" -UsecaseBlock `
         {

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ param (`
`28`	`28`	`[parameter(HelpMessage="Local path where the windows ISO is stored")]`
`29`	`29`	`[Parameter(ParameterSetName="default", Mandatory=$false)]`
`30`	`30`	`[Parameter(ParameterSetName="tenant", Mandatory=$false)]`
`31`		`- [ValidateNotNullOrEmpty()]`
	`31`	`+ [ValidateScript({Test-Path -Path $_})]`
`32`	`32`	`[string]$WindowsISOPath,`
`33`	`33`	`[parameter(HelpMessage="Fully qualified domain name of the azure stack environment. Ex: contoso.com")]`
`34`	`34`	`[Parameter(ParameterSetName="default", Mandatory=$false)]`
`@@ -150,7 +150,7 @@ while ($runCount -le $NumberOfIterations)`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- if ($WindowsISOPath -and (Test-Path -Path $WindowsISOPath))`
	`153`	`+ if ($WindowsISOPath)`
`154`	`154`	`{`
`155`	`155`	Invoke-Usecase -Name 'UploadWindows2016ImageToPIR' -Description "Uploads a windows server 2016 image to the PIR" -UsecaseBlock `
`156`	`156`	`{`