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

Jump to bottom

Make initial Mock cleanup more performant #2332

Merged
merged 4 commits into from
Apr 1, 2023
Merged

Make initial Mock cleanup more performant #2332

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8a9de42
Don't remove functions in initial Mock cleanup
nohwnd Mar 30, 2023
03f4a77
Revert back to removing functions, but use Get-ChildItem function:/ i…
nohwnd Mar 31, 2023
de80ab7
Force and disable confirm
nohwnd Mar 31, 2023
d96fdc3
Fix deleting
nohwnd Mar 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions src/functions/Mock.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1580,31 +1580,33 @@ function Remove-MockFunctionsAndAliases ($SessionState) {
# So before putting Pester state in place we should make sure that all Pester mocks are gone
# by deleting every alias pointing to a function that starts with PesterMock_. Then we also delete the
# bootstrap function.
#
# Avoid using Get-Command to find mock functions, it is slow. https://github.com/pester/Pester/discussions/2331
$Get_Alias = $script:SafeCommands['Get-Alias']
$Get_Command = $script:SafeCommands['Get-Command']
$Get_ChildItem = $script:SafeCommands['Get-ChildItem']
$Remove_Item = $script:SafeCommands['Remove-Item']
foreach ($alias in (& $Get_Alias -Definition "PesterMock_*")) {
& $Remove_Item "alias:/$($alias.Name)"
}

foreach ($bootstrapFunction in (& $Get_Command -Name "PesterMock_*")) {
& $Remove_Item "function:/$($bootstrapFunction.Name)"
foreach ($bootstrapFunction in (& $Get_ChildItem -Name "function:/PesterMock_*")) {
& $Remove_Item "function:/$($bootstrapFunction)" -Recurse -Force -Confirm:$false
}

$ScriptBlock = {
param ($Get_Alias, $Get_Command, $Remove_Item)
param ($Get_Alias, $Get_ChildItem, $Remove_Item)
foreach ($alias in (& $Get_Alias -Definition "PesterMock_*")) {
& $Remove_Item "alias:/$($alias.Name)"
}

foreach ($bootstrapFunction in (& $Get_Command -Name "PesterMock_*")) {
& $Remove_Item "function:/$($bootstrapFunction.Name)"
foreach ($bootstrapFunction in (& $Get_ChildItem -Name "function:/PesterMock_*")) {
& $Remove_Item "function:/$($bootstrapFunction)" -Recurse -Force -Confirm:$false
}
}

# clean up in caller session state
Set-ScriptBlockScope -SessionState $SessionState -ScriptBlock $ScriptBlock
& $ScriptBlock $Get_Alias $Get_Command $Remove_Item
& $ScriptBlock $Get_Alias $Get_ChildItem $Remove_Item

# clean up also in all loaded script and manifest modules
$modules = & $script:SafeCommands['Get-Module']
Expand All @@ -1618,7 +1620,7 @@ function Remove-MockFunctionsAndAliases ($SessionState) {
# https://github.com/PowerShell/PowerShell/blob/658837323599ab1c7a81fe66fcd43f7420e4402b/src/System.Management.Automation/engine/runtime/Operations/MiscOps.cs#L51-L55
# https://github.com/pester/Pester/issues/1921
if ('Script', 'Manifest' -contains $module.ModuleType -and $null -ne $module.SessionState) {
& ($module) $ScriptBlock $Get_Alias $Get_Command $Remove_Item
& ($module) $ScriptBlock $Get_Alias $Get_ChildItem $Remove_Item
}
}
}
Expand Down Expand Up @@ -1823,13 +1825,13 @@ function Repair-EnumParameters {
# https://github.com/PowerShell/PowerShell/issues/17546
$ast = [System.Management.Automation.Language.Parser]::ParseInput("param($ParamBlock)", [ref]$null, [ref]$null)
$brokenValidateRange = $ast.FindAll({
nohwnd marked this conversation as resolved.
Show resolved Hide resolved
param($node)
$node -is [System.Management.Automation.Language.AttributeAst] -and
$node.TypeName.Name -match '(?:ValidateRange|System\.Management\.Automation\.ValidateRangeAttribute)$' -and
$node.NamedArguments.Count -gt 0 -and
# triple checking for broken argument - it won't have a value/expression
$node.NamedArguments.ExpressionOmitted -notcontains $false
}, $false)
param($node)
$node -is [System.Management.Automation.Language.AttributeAst] -and
$node.TypeName.Name -match '(?:ValidateRange|System\.Management\.Automation\.ValidateRangeAttribute)$' -and
$node.NamedArguments.Count -gt 0 -and
# triple checking for broken argument - it won't have a value/expression
$node.NamedArguments.ExpressionOmitted -notcontains $false
}, $false)

if ($brokenValidateRange.Count -eq 0) {
# No errors found. Return original string
Expand Down