Skip to content

Fixing progress for Get-ComputerInfo #9236

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
adityapatwardhan merged 2 commits into from
Apr 4, 2019
Merged

Fixing progress for Get-ComputerInfo #9236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
677166e
Fixing progress for Get-ComputerInfo
powercode Mar 27, 2019
db50e54
Fix the null check as status can never be null
adityapatwardhan Apr 1, 2019
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: 3 additions & 11 deletions src/Microsoft.PowerShell.Commands.Management/commands/management/GetComputerInfoCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ private class MiscInfoGroup

#region Instance Data
private string _machineName = localMachineName; // we might need to have cmdlet work on another machine
private ProgressRecord _progress = null;

/// <summary>
/// Collection of property names from the Property parameter,
Expand Down Expand Up @@ -225,17 +224,10 @@ protected override void ProcessRecord()
/// </param>
private void UpdateProgress(string status)
{
if (_progress != null)
{
_progress.RecordType = ProgressRecordType.Completed;
WriteProgress(_progress);
}
ProgressRecord progress = new ProgressRecord(0, activity, status ?? ComputerResources.ProgressStatusCompleted);
progress.RecordType = status == null ? ProgressRecordType.Completed : ProgressRecordType.Processing;

if (status != null)
{
_progress = new ProgressRecord(0, activity, status);
WriteProgress(_progress);
}
WriteProgress(progress);
Comment thread
powercode marked this conversation as resolved.
Outdated
}

/// <summary>
Expand Down
12 changes: 12 additions & 0 deletions test/powershell/Modules/Microsoft.PowerShell.Management/Get-ComputerInfo.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,6 +1010,18 @@ try {
$computerInfo = Get-ComputerInfo
$computerInfo | Should -BeOfType 'Microsoft.PowerShell.Commands.ComputerInfo'
}

It "Verify progress records in Get-ComputerInfo" {
try {
$j = Start-Job { Get-ComputerInfo }
$j | Wait-Job
$j.ChildJobs[0].Progress | Should -HaveCount 9
$j.ChildJobs[0].Progress[-1].RecordType | Should -Be ([System.Management.Automation.ProgressRecordType]::Completed)
}
finally {
$j | Remove-Job
}
}
}

Describe "Tests for Get-ComputerInfo" -tags "Feature", "RequireAdminOnWindows" {
Expand Down