Skip to content

Updating ModulePath.Tests for fxdependent package #7772

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
adityapatwardhan merged 2 commits into from
Sep 17, 2018
Merged

Updating ModulePath.Tests for fxdependent package #7772

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
df07e2f
Updating ModulePath.Tests for fxdependent package
Sep 12, 2018
bf2c7b6
replaced if condition with shorter syntax
Sep 12, 2018
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
11 changes: 7 additions & 4 deletions test/powershell/engine/Module/ModulePath.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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'
Expand All @@ -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.
Expand Down Expand Up @@ -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'
Expand All @@ -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.
Expand Down