Skip to content

Commit 67707dc

Browse files
Copilotjohlju
andcommitted
Fix ErrorAction 'Ignore' compatibility issue in role integration tests
Co-authored-by: johlju <[email protected]>
1 parent a8b70ae commit 67707dc

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

tests/Integration/Commands/New-SqlDscRole.Integration.Tests.ps1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ Describe 'New-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017', '
5555

5656
AfterAll {
5757
# Clean up only the temporary test roles, not the shared ones
58-
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'Ignore'
58+
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'SilentlyContinue'
5959
if ($existingRole)
6060
{
61-
Remove-SqlDscRole -RoleObject $existingRole -Force -ErrorAction 'Ignore'
61+
Remove-SqlDscRole -RoleObject $existingRole -Force -ErrorAction 'SilentlyContinue'
6262
}
6363

64-
$existingRoleWithOwner = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameWithOwner -ErrorAction 'Ignore'
64+
$existingRoleWithOwner = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameWithOwner -ErrorAction 'SilentlyContinue'
6565
if ($existingRoleWithOwner)
6666
{
67-
Remove-SqlDscRole -RoleObject $existingRoleWithOwner -Force -ErrorAction 'Ignore'
67+
Remove-SqlDscRole -RoleObject $existingRoleWithOwner -Force -ErrorAction 'SilentlyContinue'
6868
}
6969

7070
Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject
@@ -115,7 +115,7 @@ Describe 'New-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017', '
115115
# Clean up the pipeline test role
116116
if ($script:pipelineTestRole)
117117
{
118-
Remove-SqlDscRole -RoleObject $script:pipelineTestRole -Force -ErrorAction 'Ignore'
118+
Remove-SqlDscRole -RoleObject $script:pipelineTestRole -Force -ErrorAction 'SilentlyContinue'
119119
}
120120
}
121121
}

tests/Integration/Commands/Remove-SqlDscRole.Integration.Tests.ps1

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ Describe 'Remove-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017'
5555

5656
AfterAll {
5757
# Clean up any test roles that might still exist
58-
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'Ignore'
58+
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'SilentlyContinue'
5959
if ($existingRole)
6060
{
61-
Remove-SqlDscRole -RoleObject $existingRole -Force -ErrorAction 'Ignore'
61+
Remove-SqlDscRole -RoleObject $existingRole -Force -ErrorAction 'SilentlyContinue'
6262
}
6363

64-
$existingRoleByObject = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameByObject -ErrorAction 'Ignore'
64+
$existingRoleByObject = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameByObject -ErrorAction 'SilentlyContinue'
6565
if ($existingRoleByObject)
6666
{
67-
Remove-SqlDscRole -RoleObject $existingRoleByObject -Force -ErrorAction 'Ignore'
67+
Remove-SqlDscRole -RoleObject $existingRoleByObject -Force -ErrorAction 'SilentlyContinue'
6868
}
6969

7070
Disconnect-SqlDscDatabaseEngine -ServerObject $script:serverObject
@@ -76,7 +76,7 @@ Describe 'Remove-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017'
7676
Context 'When removing a SQL Server role by name' {
7777
BeforeEach {
7878
# Only create test role if it doesn't exist
79-
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'Ignore'
79+
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'SilentlyContinue'
8080
if (-not $existingRole) {
8181
New-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -Force
8282
}
@@ -132,7 +132,7 @@ Describe 'Remove-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017'
132132
Context 'When removing a SQL Server role by object' {
133133
BeforeEach {
134134
# Only create test role if it doesn't exist
135-
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameByObject -ErrorAction 'Ignore'
135+
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameByObject -ErrorAction 'SilentlyContinue'
136136
if (-not $existingRole) {
137137
New-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleNameByObject -Force
138138
}
@@ -162,7 +162,7 @@ Describe 'Remove-SqlDscRole' -Tag @('Integration_SQL2016', 'Integration_SQL2017'
162162
Context 'When using pipeline input' {
163163
BeforeEach {
164164
# Only create test role if it doesn't exist
165-
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'Ignore'
165+
$existingRole = Get-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -ErrorAction 'SilentlyContinue'
166166
if (-not $existingRole) {
167167
New-SqlDscRole -ServerObject $script:serverObject -Name $script:testRoleName -Force
168168
}

0 commit comments

Comments
 (0)