Skip to content

Fix for issue 5752: pwsh cannot start in a directory with a name that includes a wildcard #7240

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
daxian-dbw merged 4 commits into from
Jul 12, 2018
Merged

Fix for issue 5752: pwsh cannot start in a directory with a name that includes a wildcard #7240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25670e7
Support pwsh starting in directories which may have wildcard characte…
JamesWTruher Jul 6, 2018
206ca71
Update ConsoleHost.Tests.ps1
JamesWTruher Jul 6, 2018
aa76ace
Address a timing issue in ThreadJobs tests.
JamesWTruher Jul 9, 2018
7b3e866
remove changes in threadjob tests
JamesWTruher Jul 11, 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
1 change: 1 addition & 0 deletions src/System.Management.Automation/engine/InitialSessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3229,6 +3229,7 @@ internal static void SetSessionStateDrive(ExecutionContext context, bool setLoca

try
{
providerContext.SuppressWildcardExpansion = true;
Copy link
Copy Markdown

@KillyMXI KillyMXI Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(style) Maybe it's just my OCD, by why configuring providerContext inside try block rather than right after initialization?

Copy link
Copy Markdown
Collaborator Author

@JamesWTruher JamesWTruher Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted the two operations to be visually close, putting the assignment in the block did that for me

context.EngineSessionState.SetLocation(Directory.GetCurrentDirectory(), providerContext);
}
catch (ItemNotFoundException)
Expand Down
24 changes: 24 additions & 0 deletions test/powershell/Host/ConsoleHost.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,3 +683,27 @@ Describe "Pwsh exe resources tests" -Tag CI {
$psversiontable.os | Should -MatchExactly "$($osversion.Major).$($osversion.Minor)"
}
}

Describe 'Pwsh startup in directories that contain wild cards' -Tag CI {
BeforeAll {
$powershell = Join-Path -Path $PsHome -ChildPath "pwsh"
$dirnames = "[T]est","[Test","T][est","Test"
$testcases = @()
foreach ( $d in $dirnames ) {
$null = New-Item -type Directory -path "${TESTDRIVE}/$d"
$testcases += @{ Dirname = $d }
}
}

It "pwsh can startup in a directory named <dirname>" -testcases $testcases {
param ( $dirname )
try {
Push-Location -LiteralPath "${TESTDRIVE}/${dirname}"
$result = & $powershell -c '(Get-Item .).Name'
Copy link
Copy Markdown
Collaborator

@iSazonov iSazonov Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we use cmdlet? Maybe better .Net method to get current directory or -LiteralPath?

Copy link
Copy Markdown
Collaborator Author

@JamesWTruher JamesWTruher Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it really doesn't matter, does it?

Copy link
Copy Markdown
Member

@adityapatwardhan adityapatwardhan Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, maybe use

$result = & $powershell -c '([Environment]::CurrentDirectory)'

Copy link
Copy Markdown
Collaborator Author

@JamesWTruher JamesWTruher Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, I want to check only the name, ason some systems, Environment.CurrentDirectory will include a symlink which is a problem because PS does not, I'm I need to call split-path, I can use this form just as well.

Copy link
Copy Markdown
Collaborator

@BrucePay BrucePay Jul 9, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are testing PowerShell, it would makes sense to use PowerShell i.e. the way Jim has written it rather then calling .NET. Why do you think it should be a .NET call? Is there some reason not to use native PowerShell capabilities?

Copy link
Copy Markdown
Collaborator

@iSazonov iSazonov Jul 10, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My misunderstanding is that we use Directory.GetCurrentDirectory() in the code and Set-Location and Get-Item in the test - do we work with different current directories (first in .Net, second in FileSystem provider)?

$result | Should -BeExactly $dirname
}
finally {
Pop-Location
}
}
}