Skip to content

Commit 50b1d2b

Browse files
potatoqualiteepotatoqualitee
committed
Merge branch 'development' of https://github.com/dataplat/dbatools into development
2 parents 63c036e + f2b4279 commit 50b1d2b

File tree

3 files changed

+33
-17
lines changed

3 files changed

+33
-17
lines changed

‎tests/Copy-DbaEndpoint.Tests.ps1

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,21 @@ Describe "$CommandName Unit Tests" -Tag 'UnitTests' {
2020

2121
Describe "$commandname Integration Tests" -Tag "IntegrationTests" {
2222
BeforeAll {
23-
$endpoint = Get-DbaEndpoint -SqlInstance $script:instance2 | Where-Object EndpointType -eq DatabaseMirroring
24-
$create = $endpoint | Export-DbaScript -Passthru
25-
$null = $endpoint | Remove-DbaEndpoint -Confirm:$false
26-
$results = New-DbaEndpoint -SqlInstance $script:instance2 -Type DatabaseMirroring -Role Partner -Name Mirroring -Confirm:$false
23+
Get-DbaEndpoint -SqlInstance $script:instance2 -Type DatabaseMirroring | Remove-DbaEndpoint -Confirm:$false
24+
New-DbaEndpoint -SqlInstance $script:instance2 -Name dbatoolsci_MirroringEndpoint -Type DatabaseMirroring -Port 5022 -Owner sa
25+
Get-DbaEndpoint -SqlInstance $script:instance3 -Type DatabaseMirroring | Remove-DbaEndpoint -Confirm:$false
2726
}
2827
AfterAll {
29-
if ($create) {
30-
$null = Get-DbaEndpoint -SqlInstance $script:instance2, $script:instance3 | Where-Object EndpointType -eq DatabaseMirroring | Remove-DbaEndpoint -Confirm:$false
31-
Invoke-DbaQuery -SqlInstance $script:instance2 -Query "$create"
32-
}
28+
Get-DbaEndpoint -SqlInstance $script:instance2 -Type DatabaseMirroring | Remove-DbaEndpoint -Confirm:$false
29+
New-DbaEndpoint -SqlInstance $script:instance2 -Name dbatoolsci_MirroringEndpoint -Type DatabaseMirroring -Port 5022 -Owner sa
30+
Get-DbaEndpoint -SqlInstance $script:instance3 -Type DatabaseMirroring | Remove-DbaEndpoint -Confirm:$false
31+
New-DbaEndpoint -SqlInstance $script:instance3 -Name dbatoolsci_MirroringEndpoint -Type DatabaseMirroring -Port 5023 -Owner sa
3332
}
3433

3534
It "copies an endpoint" {
36-
$results = Copy-DbaEndpoint -Source $script:instance2 -Destination $script:instance3 -Endpoint Mirroring
35+
$results = Copy-DbaEndpoint -Source $script:instance2 -Destination $script:instance3 -Endpoint dbatoolsci_MirroringEndpoint
3736
$results.DestinationServer | Should -Be $script:instance3
3837
$results.Status | Should -Be 'Successful'
39-
$results.Name | Should -Be 'Mirroring'
38+
$results.Name | Should -Be 'dbatoolsci_MirroringEndpoint'
4039
}
4140
}

‎tests/Set-DbaNetworkConfiguration.Tests.ps1

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
1616
Context "Command works with piped input" {
1717
$netConf = Get-DbaNetworkConfiguration -SqlInstance $script:instance2
1818
$netConf.TcpIpProperties.KeepAlive = 60000
19-
$results = $netConf | Set-DbaNetworkConfiguration -Confirm:$false
19+
$results = $netConf | Set-DbaNetworkConfiguration -Confirm:$false -WarningAction SilentlyContinue
2020

2121
It "Should Return a Result" {
2222
$results.ComputerName | Should -Be $netConf.ComputerName
@@ -25,14 +25,18 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
2525
It "Should Return a Change" {
2626
$results.Changes | Should -Match "Changed TcpIpProperties.KeepAlive to 60000"
2727
}
28+
29+
$netConf = Get-DbaNetworkConfiguration -SqlInstance $script:instance2
30+
$netConf.TcpIpProperties.KeepAlive = 30000
31+
$null = $netConf | Set-DbaNetworkConfiguration -Confirm:$false -WarningAction SilentlyContinue
2832
}
2933

3034
Context "Command works with commandline input" {
3135
$netConf = Get-DbaNetworkConfiguration -SqlInstance $script:instance2
3236
if ($netConf.NamedPipesEnabled) {
33-
$results = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -DisableProtocol NamedPipes -Confirm:$false
37+
$results = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -DisableProtocol NamedPipes -Confirm:$false -WarningAction SilentlyContinue
3438
} else {
35-
$results = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -EnableProtocol NamedPipes -Confirm:$false
39+
$results = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -EnableProtocol NamedPipes -Confirm:$false -WarningAction SilentlyContinue
3640
}
3741

3842
It "Should Return a Result" {
@@ -44,9 +48,9 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
4448
}
4549

4650
if ($netConf.NamedPipesEnabled) {
47-
$null = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -EnableProtocol NamedPipes -Confirm:$false
51+
$null = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -EnableProtocol NamedPipes -Confirm:$false -WarningAction SilentlyContinue
4852
} else {
49-
$null = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -DisableProtocol NamedPipes -Confirm:$false
53+
$null = Set-DbaNetworkConfiguration -SqlInstance $script:instance2 -DisableProtocol NamedPipes -Confirm:$false -WarningAction SilentlyContinue
5054
}
5155
}
5256
}

‎tests/Start-DbaXESession.Tests.ps1

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
5252
# Drop created objects
5353
$conn.ExecuteNonQuery("IF EXISTS(SELECT * FROM sys.server_event_sessions WHERE name = 'dbatoolsci_session_invalid') DROP EVENT SESSION [dbatoolsci_session_invalid] ON SERVER;")
5454
$conn.ExecuteNonQuery("IF EXISTS(SELECT * FROM sys.server_event_sessions WHERE name = 'dbatoolsci_session_valid') DROP EVENT SESSION [dbatoolsci_session_valid] ON SERVER;")
55+
Get-DbaAgentSchedule -SqlInstance $script:instance2 -Schedule "XE Session START - dbatoolsci_session_valid", "XE Session STOP - dbatoolsci_session_valid" | Remove-DbaAgentSchedule -Force -Confirm:$false
5556
}
5657

5758
Context "Verifying command works" {
@@ -90,22 +91,34 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
9091
It "works when -StopAt is passed" {
9192
$StopAt = (Get-Date).AddSeconds(10)
9293
Start-DbaXESession $server -Session $dbatoolsciValid.Name -StopAt $StopAt -WarningAction SilentlyContinue
94+
$dbatoolsciValid.Refresh()
9395
$dbatoolsciValid.IsRunning | Should Be $true
9496
(Get-DbaAgentJob -SqlInstance $server -Job "XE Session STOP - dbatoolsci_session_valid").Count | Should -Be 1
9597
$stopSchedule = Get-DbaAgentSchedule -SqlInstance $server -Schedule "XE Session STOP - dbatoolsci_session_valid"
9698
$stopSchedule.ActiveStartTimeOfDay.ToString('hhmmss') | Should -Be $StopAt.TimeOfDay.ToString('hhmmss')
9799
$stopSchedule.ActiveStartDate | Should -Be $StopAt.Date
100+
Start-Sleep -Seconds 11
101+
$dbatoolsciValid.Refresh()
102+
$dbatoolsciValid.IsRunning | Should Be $false
103+
# Using $script:instance2 because the SMO $server is not updated after the job is removed
104+
(Get-DbaAgentJob -SqlInstance $script:instance2 -Job "XE Session STOP - dbatoolsci_session_valid").Count | Should -Be 0
98105
}
99106

100107
It "works when -StartAt is passed" {
101108
$null = Stop-DbaXESession -SqlInstance $server -Session $dbatoolsciValid.Name -WarningAction SilentlyContinue
102109
$StartAt = (Get-Date).AddSeconds(10)
103-
$session = Start-DbaXESession $server -Session $dbatoolsciValid.Name -StartAt $StartAt
104-
$session.IsRunning | Should Be $false
110+
$null = Start-DbaXESession $server -Session $dbatoolsciValid.Name -StartAt $StartAt
111+
$dbatoolsciValid.Refresh()
112+
$dbatoolsciValid.IsRunning | Should Be $false
105113
(Get-DbaAgentJob -SqlInstance $server -Job "XE Session START - dbatoolsci_session_valid").Count | Should -Be 1
106114
$startSchedule = Get-DbaAgentSchedule -SqlInstance $server -Schedule "XE Session START - dbatoolsci_session_valid"
107115
$startSchedule.ActiveStartTimeOfDay.ToString('hhmmss') | Should -Be $StartAt.TimeOfDay.ToString('hhmmss')
108116
$startSchedule.ActiveStartDate | Should -Be $StartAt.Date
117+
Start-Sleep -Seconds 11
118+
$dbatoolsciValid.Refresh()
119+
$dbatoolsciValid.IsRunning | Should Be $true
120+
# Using $script:instance2 because the SMO $server is not updated after the job is removed
121+
(Get-DbaAgentJob -SqlInstance $script:instance2 -Job "XE Session STOP - dbatoolsci_session_valid").Count | Should -Be 0
109122
}
110123

111124
}

0 commit comments

Comments
 (0)