Skip to content

[release/v7.3.2] Fix Start-Job to check the existence of working directory using the PowerShell way #18917

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
TravisEz13 merged 5 commits into from
Jan 10, 2023
Merged

[release/v7.3.2] Fix Start-Job to check the existence of working directory using the PowerShell way #18917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4397fe
Fix `Start-Job` to check the existence of working directory using the…
daxian-dbw Nov 28, 2022
7eb70da
Add a test
daxian-dbw Nov 28, 2022
7d2029b
Update
daxian-dbw Nov 28, 2022
014a68a
Fix the test
daxian-dbw Nov 29, 2022
d90dbf7
Not covering the check of whitespace string for -WorkingDirectory
daxian-dbw Jan 10, 2023
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
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/StartJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ protected override void BeginProcessing()
ThrowTerminatingError(errorRecord);
}

if (WorkingDirectory != null && !Directory.Exists(WorkingDirectory))
if (WorkingDirectory != null && !InvokeProvider.Item.IsContainer(WorkingDirectory))
{
string message = StringUtil.Format(RemotingErrorIdStrings.StartJobWorkingDirectoryNotFound, WorkingDirectory);
var errorRecord = new ErrorRecord(
Expand Down
19 changes: 15 additions & 4 deletions test/powershell/engine/Job/Jobs.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
BeforeAll {
$invalidPathTestCases = @(
@{ path = "This is an invalid path"; case = "invalid path"; errorId = "DirectoryNotFoundException,Microsoft.PowerShell.Commands.StartJobCommand"}
@{ path = ""; case = "empty string"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
@{ path = " "; case = "whitespace string (single space)"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
##@{ path = ""; case = "empty string"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
##@{ path = " "; case = "whitespace string (single space)"; errorId = "ParameterArgumentValidationError,Microsoft.PowerShell.Commands.StartJobCommand"}
)
}

Expand Down Expand Up @@ -86,6 +86,17 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
$jobOutput | Should -BeExactly $path.ToString()
}

It 'Can specify the working directory with a PSPath' {
try {
Push-Location 'Temp:\'
$job = Start-Job -ScriptBlock { $PWD } -WorkingDirectory $pwd.Path | Wait-Job
$jobOutput = Receive-Job $job
$jobOutput | Should -BeExactly $pwd.Path
} finally {
Pop-Location
}
}

It 'Can use the user specified working directory parameter with quote' -Skip:($IsWindows) {
$path = Join-Path -Path $TestDrive -ChildPath "My ""Dir"
$null = New-Item -ItemType Directory -Path "$path"
Expand All @@ -100,9 +111,9 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
}

It 'Throws an error when the working directory parameter is <case>' -TestCases $invalidPathTestCases {
param($path, $case, $expectedErrorId)
param($path, $case, $errorId)

{Start-Job -ScriptBlock { 1 + 1 } -WorkingDirectory $path} | Should -Throw -ErrorId $expectedErrorId
{Start-Job -ScriptBlock { 1 + 1 } -WorkingDirectory $path} | Should -Throw -ErrorId $errorId
}

It 'Verifies that the current working directory is preserved' {
Expand Down