Fix unit tests

dsccommunity · May 9, 2020 · dc19ba6 · dc19ba6
1 parent 3bb8501
commit dc19ba6
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -57,6 +57,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - SqlServerDsc.Common
   - The helper function `Invoke-InstallationMediaCopy` was changed to
     handle a breaking change in PowerShell 7 ([issue #1530](https://github.com/dsccommunity/SqlServerDsc/issues/1530)).
+- CommonTestHelper
+  - The test helper function `New-SQLSelfSignedCertificate` was changed
+    to install the dependent module `PSPKI` through `RequiredModules.psd1`.
 - SqlAlwaysOnService
   - BREAKING CHANGE: The parameter `ServerName` is now non-mandatory and
     defaults to `$env:COMPUTERNAME` ([issue #319](https://github.com/dsccommunity/SqlServerDsc/issues/319)).

diff --git a/RequiredModules.psd1 b/RequiredModules.psd1
@@ -23,6 +23,7 @@
 
     # Dependency for integration tests
     LoopbackAdapter             = 'latest'
+    PSPKI                       = 'latest'
 
     # Prerequisites modules needed for examples or integration tests
     PSDscResources              = '2.12.0.0'

diff --git a/...e/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortIPAddressOwner.ps1 b/...e/Examples/Resources/SqlServerEndpoint/2-CreateEndpointWithSpecificPortIPAddressOwner.ps1
@@ -21,6 +21,7 @@ Configuration Example
             Ensure               = 'Present'
 
             EndpointName         = 'HADR'
+            EndpointType         = 'DatabaseMirroring'
             Port                 = 9001
             IpAddress            = '192.168.0.20'
             Owner                = 'sa'

diff --git a/tests/Integration/DSC_SqlServerEndpoint.config.ps1 b/tests/Integration/DSC_SqlServerEndpoint.config.ps1
@@ -50,7 +50,7 @@ Configuration DSC_SqlServerEndpoint_Add_Config
             Port                 = $Node.Port
             IpAddress            = $Node.IpAddress
             Owner                = $Node.Owner
-            State                = 'Running'
+            State                = 'Started'
 
             ServerName           = $Node.ServerName
             InstanceName         = $Node.InstanceName

diff --git a/tests/TestHelpers/CommonTestHelper.psm1 b/tests/TestHelpers/CommonTestHelper.psm1
@@ -252,7 +252,6 @@ function New-SQLSelfSignedCertificate
         There are build workers still on Windows Server 2012 R2 so let's
         use the alternate method of New-SelfSignedCertificate.
     #>
-    Install-Module -Name 'PSPKI' -Scope 'CurrentUser' -Force
     Import-Module -Name 'PSPKI'
 
     $newSelfSignedCertificateExParameters = @{