Updating ModulePath.Tests for fxdependent package (#7772)

Andrew · adityapatwardhan · commit e725a030d775 · 2018-09-17T13:22:00.000-07:00
diff --git a/test/powershell/engine/Module/ModulePath.Tests.ps1 b/test/powershell/engine/Module/ModulePath.Tests.ps1
@@ -23,6 +23,9 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
         }
         $expectedSystemPath = Join-Path -Path $PSHOME -ChildPath 'Modules'
 
+        # Skip these tests in cases when there is no 'pwsh' executable (e.g. when framework dependent PS package is used)
+        $skipNoPwsh = -not (Test-Path $powershell)
+        
         if ($IsWindows)
         {
             $expectedWindowsPowerShellPSHomePath = Join-Path $env:windir "System32" "WindowsPowerShell" "v1.0" "Modules"
@@ -46,7 +49,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
         $env:PSModulePath = $originalModulePath
     }
 
-    It "validate sxs module path" {
+    It "validate sxs module path" -Skip:$skipNoPwsh {
 
         $env:PSModulePath = ""
         $defaultModulePath = & $powershell -nopro -c '$env:PSModulePath'
@@ -71,7 +74,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
         }
     }
 
-    It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR) {
+    It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR -or $skipNoPwsh) {
 
         ## Create 'powershell' and 'pwsh.deps.json' in the fake PSHome folder,
         ## so that the module path calculation logic would believe it's real.
@@ -110,7 +113,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
         }
     }
 
-    It "keep non-pshome module path derived from powershell core instance parent" -Skip:(!$IsCoreCLR) {
+    It "keep non-pshome module path derived from powershell core instance parent" -Skip:(!$IsCoreCLR -or $skipNoPwsh) {
 
         ## non-pshome module path derived from another powershell core instance should be preserved
         $customeModules = Join-Path -Path $TestDrive -ChildPath 'CustomModules'
@@ -130,7 +133,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {
         $paths -contains $customeModules | Should -BeTrue
     }
 
-    It 'Ensures $PSHOME\Modules is inserted correctly when launched from a different version of PowerShell' -Skip:(!($IsCoreCLR -and $IsWindows)) {
+    It 'Ensures $PSHOME\Modules is inserted correctly when launched from a different version of PowerShell' -Skip:(!($IsCoreCLR -and $IsWindows) -or $skipNoPwsh) {
         # When launched from a different version of PowerShell, PSModulePath contains the other version's PSHOME\Modules path
         # and the Windows PowerShell modoule path. THe other version's module path should be removed and this version's
         # PSHOME\Modules path should be inserted before Windows PowerShell module path.

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,9 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {`
`23`	`23`	`}`
`24`	`24`	`$expectedSystemPath = Join-Path -Path $PSHOME -ChildPath 'Modules'`
`25`	`25`
	`26`	`+ # Skip these tests in cases when there is no 'pwsh' executable (e.g. when framework dependent PS package is used)`
	`27`	`+ $skipNoPwsh = -not (Test-Path $powershell)`
	`28`	`+`
`26`	`29`	`if ($IsWindows)`
`27`	`30`	`{`
`28`	`31`	`$expectedWindowsPowerShellPSHomePath = Join-Path $env:windir "System32" "WindowsPowerShell" "v1.0" "Modules"`
`@@ -46,7 +49,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {`
`46`	`49`	`$env:PSModulePath = $originalModulePath`
`47`	`50`	`}`
`48`	`51`
`49`		`- It "validate sxs module path" {`
	`52`	`+ It "validate sxs module path" -Skip:$skipNoPwsh {`
`50`	`53`
`51`	`54`	`$env:PSModulePath = ""`
`52`	`55`	`$defaultModulePath = & $powershell -nopro -c '$env:PSModulePath'`
`@@ -71,7 +74,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {`
`71`	`74`	`}`
`72`	`75`	`}`
`73`	`76`
`74`		`- It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR) {`
	`77`	`+ It "ignore pshome module path derived from a different powershell core instance" -Skip:(!$IsCoreCLR -or $skipNoPwsh) {`
`75`	`78`
`76`	`79`	`## Create 'powershell' and 'pwsh.deps.json' in the fake PSHome folder,`
`77`	`80`	`## so that the module path calculation logic would believe it's real.`
`@@ -110,7 +113,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {`
`110`	`113`	`}`
`111`	`114`	`}`
`112`	`115`
`113`		`- It "keep non-pshome module path derived from powershell core instance parent" -Skip:(!$IsCoreCLR) {`
	`116`	`+ It "keep non-pshome module path derived from powershell core instance parent" -Skip:(!$IsCoreCLR -or $skipNoPwsh) {`
`114`	`117`
`115`	`118`	`## non-pshome module path derived from another powershell core instance should be preserved`
`116`	`119`	`$customeModules = Join-Path -Path $TestDrive -ChildPath 'CustomModules'`
`@@ -130,7 +133,7 @@ Describe "SxS Module Path Basic Tests" -tags "CI" {`
`130`	`133`	`$paths -contains $customeModules \| Should -BeTrue`
`131`	`134`	`}`
`132`	`135`
`133`		`- It 'Ensures $PSHOME\Modules is inserted correctly when launched from a different version of PowerShell' -Skip:(!($IsCoreCLR -and $IsWindows)) {`
	`136`	`+ It 'Ensures $PSHOME\Modules is inserted correctly when launched from a different version of PowerShell' -Skip:(!($IsCoreCLR -and $IsWindows) -or $skipNoPwsh) {`
`134`	`137`	`# When launched from a different version of PowerShell, PSModulePath contains the other version's PSHOME\Modules path`
`135`	`138`	`# and the Windows PowerShell modoule path. THe other version's module path should be removed and this version's`
`136`	`139`	`# PSHOME\Modules path should be inserted before Windows PowerShell module path.`