Skip to content
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

Enable PsesInternalHostTests (previously PowerShellContextTests) #1651

Merged
merged 5 commits into from
Jan 5, 2022
Merged

Enable PsesInternalHostTests (previously PowerShellContextTests) #1651

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b8480d6
Add `TestUtilities.GetSharedPath()`
andyleejordan Dec 27, 2021
a3fbde3
Enable `PsesInternalHostTests` (previously `PowerShellContextTests`)
andyleejordan Dec 27, 2021
2648d12
Add regression test for `throw`
andyleejordan Dec 28, 2021
4997f67
Fix `ArgumentOutOfRangeException` when `throw` is used
JustinGrote Nov 15, 2021
57bdb36
Simplify application of `Trait` in `DebugServiceTests`
andyleejordan Dec 28, 2021
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
Prev Previous commit
Next Next commit
Fix ArgumentOutOfRangeException when throw is used 
Co-authored-by: Andy Schwartzmeyer <andrew@schwartzmeyer.com>
  • Loading branch information
@JustinGrote @andyleejordan
JustinGrote and andyleejordan committed Jan 5, 2022
commit 4997f676f231e2d413692f329567bf15e1051072
2 changes: 1 addition & 1 deletion src/PowerShellEditorServices/Services/PowerShell/Utility/ErrorRecordExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ static ErrorRecordExtensions()
s_setWriteStreamProperty = Expression.Lambda<Action<PSObject>>(
Expression.Call(
errorObjectParameter,
writeStreamProperty.GetSetMethod(),
writeStreamProperty.GetSetMethod(nonPublic: true),
Expression.Constant(errorStreamType)),
errorObjectParameter)
.Compile();
Expand Down
11 changes: 7 additions & 4 deletions src/PowerShellEditorServices/Utility/PSCommandExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ public static PSCommand AddDebugOutputCommand(this PSCommand psCommand)

public static PSCommand MergePipelineResults(this PSCommand psCommand)
{
// We need to do merge errors and output before rendering with an Out- cmdlet
Command lastCommand = psCommand.Commands[psCommand.Commands.Count - 1];
lastCommand.MergeMyResults(PipelineResultTypes.Error, PipelineResultTypes.Output);
lastCommand.MergeMyResults(PipelineResultTypes.Information, PipelineResultTypes.Output);
if (psCommand.Commands.Count > 0)
{
// We need to do merge errors and output before rendering with an Out- cmdlet
Command lastCommand = psCommand.Commands[psCommand.Commands.Count - 1];
lastCommand.MergeMyResults(PipelineResultTypes.Error, PipelineResultTypes.Output);
lastCommand.MergeMyResults(PipelineResultTypes.Information, PipelineResultTypes.Output);
}
return psCommand;
}

Expand Down
12 changes: 4 additions & 8 deletions test/PowerShellEditorServices.Test/Session/PsesInternalHostTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,10 @@ public async Task CanExecutePSCommand()
[Fact] // https://github.com/PowerShell/vscode-powershell/issues/3677
public async Task CanHandleThrow()
{
// TODO: Fix this so it doesn't throw!
_ = await Assert.ThrowsAsync<ArgumentOutOfRangeException>(() =>
{
return psesHost.ExecutePSCommandAsync(
new PSCommand().AddScript("throw"),
CancellationToken.None,
new PowerShellExecutionOptions { ThrowOnError = false });
}).ConfigureAwait(true);
await psesHost.ExecutePSCommandAsync(
new PSCommand().AddScript("throw"),
CancellationToken.None,
new PowerShellExecutionOptions { ThrowOnError = false }).ConfigureAwait(true);
}

[Fact]
Expand Down