Skip to content

Fixing Import-Module on Linux for special cases of NestedModules/RootModule path format #4010

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
mirichmo merged 3 commits into from
Jun 28, 2017
Merged

Fixing Import-Module on Linux for special cases of NestedModules/RootModule path format #4010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f8f81a
IPMO fix for some cases of NestedModules/RootModule path syntax
Jun 14, 2017
7d03492
Added tests for #3693 fix
Jun 14, 2017
56daa51
Updated tests
Jun 19, 2017
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
5 changes: 2 additions & 3 deletions src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,19 +613,18 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
Guid? savedBaseGuid = BaseGuid;

var importingModule = 0 != (manifestProcessingFlags & ManifestProcessingFlags.LoadElements);

string extension = Path.GetExtension(moduleSpecification.Name);
// First check for fully-qualified paths - either absolute or relative
string rootedPath = ResolveRootedFilePath(moduleSpecification.Name, this.Context);
if (String.IsNullOrEmpty(rootedPath))
{
rootedPath = Path.Combine(moduleBase, moduleSpecification.Name);
rootedPath = FixupFileName(moduleBase, moduleSpecification.Name, extension);
}
else
{
wasRooted = true;
}

string extension = Path.GetExtension(moduleSpecification.Name);
try
{
this.Context.Modules.IncrementModuleNestingDepth(this, rootedPath);
Expand Down
54 changes: 54 additions & 0 deletions test/powershell/engine/Module/SubmodulePathInManifest.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
Describe "Tests for paths of submodules in module manifest" -tags "CI" {

$moduleName = 'ModuleA'
$moduleFileName = "$moduleName.psd1"
$submoduleName = 'ModuleB'
$submoduleFileName = "$submoduleName.psm1"
$moduleRootPath = Join-Path $TestDrive $moduleName
$moduleFilePath = Join-Path $moduleRootPath $moduleFileName
$nestedModulePath = Join-Path $moduleRootPath $submoduleName
$nestedModuleFilePath = Join-Path $nestedModulePath $submoduleFileName

BeforeEach {

Remove-Module $moduleName -Force -ErrorAction SilentlyContinue
Remove-Item $moduleRootPath -Recurse -Force -ErrorAction SilentlyContinue

New-Item -ItemType Directory -Force -Path $nestedModulePath
"function TestModuleFunction{'Hello from TestModuleFunction'}" | Out-File $nestedModuleFilePath
}

$testCases = @(
@{ SubModulePath = "$submoduleName" }
@{ SubModulePath = "$submoduleName\$submoduleName" }
@{ SubModulePath = "$submoduleName/$submoduleName" }
@{ SubModulePath = "$submoduleName\$submoduleFileName" }
@{ SubModulePath = "$submoduleName/$submoduleFileName" }
@{ SubModulePath = ".\$submoduleName" }
@{ SubModulePath = ".\$submoduleName\$submoduleName" }
@{ SubModulePath = ".\$submoduleName/$submoduleName" }
@{ SubModulePath = ".\$submoduleName\$submoduleFileName" }
@{ SubModulePath = ".\$submoduleName/$submoduleFileName" }
@{ SubModulePath = "./$submoduleName" }
@{ SubModulePath = "./$submoduleName/$submoduleName" }
@{ SubModulePath = "./$submoduleName\$submoduleName" }
@{ SubModulePath = "./$submoduleName/$submoduleFileName" }
@{ SubModulePath = "./$submoduleName\$submoduleFileName" }
)

It "Test if NestedModule path is <SubModulePath>" -TestCases $testCases {
param($SubModulePath)

New-ModuleManifest $moduleFilePath -NestedModules @($SubModulePath)
Import-Module $moduleFilePath
(Get-Module $moduleName).ExportedCommands.Keys.Contains('TestModuleFunction') | Should Be $true
}

It "Test if RootModule path is <SubModulePath>" -TestCases $testCases {
param($SubModulePath)

New-ModuleManifest $moduleFilePath -RootModule $SubModulePath
Import-Module $moduleFilePath
(Get-Module $moduleName).ExportedCommands.Keys.Contains('TestModuleFunction') | Should Be $true
}
}