Skip to content

Fix Invoke-Command missing error on session termination. #11586

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 4 commits into from
Feb 5, 2020
Merged

Fix Invoke-Command missing error on session termination. #11586

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
385da93
Fix Invoke-Command missing error on session termination.
PaulHigin Jan 15, 2020
bd38426
Fix CodeFactor issue
PaulHigin Jan 15, 2020
b8c7477
Fix regression, and update Stop-Job tests to wait until job is running
PaulHigin Jan 31, 2020
d9e2b76
CR comment: start new job for each test
PaulHigin Jan 31, 2020
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
14 changes: 13 additions & 1 deletion src/System.Management.Automation/engine/remoting/client/Job.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3382,8 +3382,11 @@ protected void ProcessJobFailure(ExecutionCmdletHelper helper, out Exception fai
fullyQualifiedErrorId, ErrorCategory.OpenError,
null, null, null, null, null, errorDetails, null);
}
else if (pipeline.PipelineStateInfo.State == PipelineState.Failed)
else if ((pipeline.PipelineStateInfo.State == PipelineState.Failed) ||
((pipeline.PipelineStateInfo.State == PipelineState.Stopped) &&
(pipeline.PipelineStateInfo.Reason != null && !(pipeline.PipelineStateInfo.Reason is PipelineStoppedException))))
{
// Pipeline stopped state is also an error condition if the associated exception is not 'PipelineStoppedException'.
object targetObject = runspace.ConnectionInfo.ComputerName;
failureException = pipeline.PipelineStateInfo.Reason;
if (failureException != null)
Expand All @@ -3394,6 +3397,15 @@ protected void ProcessJobFailure(ExecutionCmdletHelper helper, out Exception fai
if (rException != null)
{
errorRecord = rException.ErrorRecord;

// A RemoteException will hide a PipelineStoppedException, which should be ignored.
if (errorRecord != null &&
errorRecord.FullyQualifiedErrorId.Equals("PipelineStopped", StringComparison.OrdinalIgnoreCase))
{
// PipelineStoppedException should not be reported as error.
failureException = null;
return;
}
}
else
{
Expand Down
24 changes: 18 additions & 6 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 @@ -311,8 +311,24 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
@{ property = 'InstanceId'}
@{ property = 'State'}
)
# '-Seconds 100' is chosen to be substantially large, so that the job is in running state when Stop-Job is called.
$jobToStop = Start-Job -ScriptBlock { Start-Sleep -Seconds 100 } -Name 'JobToStop'
}

BeforeEach {
# 20 seconds is chosen to be large, so that the job is in running state when Stop-Job is called.
$jobToStop = Start-Job -ScriptBlock {
1..80 | ForEach-Object {
Write-Output $_
Start-Sleep -Milliseconds 250
}
} -Name 'JobToStop'
# Wait until the job is actually running and executing the script
do {
$data = Receive-Job -Job $jobToStop
} while (($data.Count -eq 0) -and ($jobToStop.State -eq 'Running'))
}

AfterEach {
Remove-Job $jobToStop -Force -ErrorAction SilentlyContinue
}

It 'Can Stop-Job with <property>' -TestCases $stopJobTestCases {
Expand All @@ -321,9 +337,5 @@ Describe 'Basic Job Tests' -Tags 'Feature' {
Stop-Job @splat
ValidateJobInfo -job $jobToStop -state 'Stopped' -hasMoreData $false
}

AfterAll {
Remove-Job $jobToStop -Force -ErrorAction SilentlyContinue
}
}
}