Refactor tests (do AgHadr)

dataplat · Oct 11, 2024 · e52ef73 · e52ef73
1 parent c215325
commit e52ef73
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/tests/Disable-DbaAgHadr.Tests.ps1 b/tests/Disable-DbaAgHadr.Tests.ps1
@@ -13,8 +13,10 @@ Describe "$CommandName Unit Tests" -Tag "UnitTests" {
     }
 }
 
+# $script:instance3 is used for Availability Group tests and needs Hadr service setting enabled
+
 Describe "$commandname Integration Tests" -Tag "IntegrationTests" {
-    BeforeAll {
+    AfterAll {
         Enable-DbaAgHadr -SqlInstance $script:instance3 -Confirm:$false -Force
     }
 

diff --git a/tests/Enable-DbaAgHadr.Tests.ps1 b/tests/Enable-DbaAgHadr.Tests.ps1
@@ -15,15 +15,7 @@ Describe "$CommandName Unit Tests" -Tag "UnitTests" {
 
 Describe "$commandname Integration Tests" -Tag "IntegrationTests" {
     BeforeAll {
-        $current = Get-DbaAgHadr -SqlInstance $script:instance3 # for appveyor $script:instance2
-        if ($current.IsHadrEnabled) {
-            Disable-DbaAgHadr -SqlInstance $script:instance3 -Confirm:$false -WarningAction SilentlyContinue -Force
-        }
-    }
-    AfterAll {
-        if (-not $current.IsHadrEnabled) {
-            Disable-DbaAgHadr -SqlInstance $script:instance3 -Confirm:$false -WarningAction SilentlyContinue -Force
-        }
+        Disable-DbaAgHadr -SqlInstance $script:instance3 -Confirm:$false -Force
     }
 
     $results = Enable-DbaAgHadr -SqlInstance $script:instance3 -Confirm:$false -Force

diff --git a/tests/Get-DbaAgHadr.Tests.ps1 b/tests/Get-DbaAgHadr.Tests.ps1
@@ -13,11 +13,13 @@ Describe "$CommandName Unit Tests" -Tag "UnitTests" {
     }
 }
 
+# $script:instance3 is used for Availability Group tests and needs Hadr service setting enabled
+
 Describe "$CommandName Integration Test" -Tag "IntegrationTests" {
-    $results = Get-DbaAgHadr -SqlInstance $script:instance2
+    $results = Get-DbaAgHadr -SqlInstance $script:instance3
     Context "Validate output" {
         It "returns the correct properties" {
-            $results.IsHadrEnabled | Should -Not -Be $null
+            $results.IsHadrEnabled | Should -Be $true
         }
     }
 }