Skip to content

Commit bfe2417

Browse files
committed
Fix integ test and changelog
1 parent 47ac19b commit bfe2417

File tree

2 files changed

+12
-48
lines changed

2 files changed

+12
-48
lines changed

CHANGELOG.md

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,25 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111
- Removed the function `Get-RegistryPropertyValue` and `Format-Path` in
1212
favor of the commands with the same names in the module _DscResource.Common_.
1313
- SqlRSSetup
14-
- The DSC resource has been refactored into a class-based resource
15-
- The parameter `SourcePath` was removed and replaced with `MediaPath`
16-
- The parameter `IAcceptLicensTerms` was removed and replaced with a
17-
boolean parameter `AcceptLicensingTerms`
14+
- The DSC resource has been refactored into a class-based resource.
15+
- The parameter `SourcePath` was replaced with `MediaPath`.
16+
- The parameter `IAcceptLicensTerms` was replaced with a boolean parameter
17+
`AcceptLicensingTerms`.
1818
- The parameter `SourceCredential` was removed. Because of this, the
1919
functionality that allowed copying the media from a UNC path using
2020
those credentials was also removed. If this was something you used,
2121
please open an issue.
2222
- The version validation no longer gets the current version from the
2323
installed package (using `Get-Package`), but instead from the registry.
24-
- The read-only property `CurrentVersion` was removed and replaced with
25-
the more appropriate property `ProductVersion`.
2624
- Prior when install was successful, the resource checked whether there
2725
were any pending rename operations. Since the install returns 3010
2826
if a restart is needed it is now assumed that the setup process takes
2927
care of this. If that is not the case, and this check is needed, then
3028
open an issue to discuss in what cases this is needed.
31-
- The `Edition` value 'Development` was removed and replaced by the value
29+
- The `Edition` option 'Development` was replaced by the value
3230
`Developer`.
33-
- The read-only properties `ServiceName` and `ErrorDumpDirectory` was removed.
31+
- The read-only properties `CurrentVersion`, `ServiceName` and `ErrorDumpDirectory`
32+
were removed.
3433

3534
### Added
3635

@@ -92,14 +91,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
9291
the module manifest.
9392
- Now integration tests will fail on an exception when the command `Test-DscConfiguration`
9493
is run.
95-
- Added Test-SqlDscIsRole to be used like Test-SqlDscIsLogin but tests for a server role as principal.
94+
- Added Test-SqlDscIsRole to be used like Test-SqlDscIsLogin but tests
95+
for a server role as principal.
9696
- SqlSetup
9797
- Fixed issue with AddNode where cluster IP information was not being passed to
9898
setup.exe ([issue #1171](https://github.com/dsccommunity/SqlServerDsc/issues/1171)).
9999
- SqlRSSetup
100100
- The DSC resource has been refactored into a class-based resource.
101101

102-
103102
### Fixed
104103

105104
- Fixed workaround for the GitHub Actions to support building module in Windows

tests/Integration/Resources/DSC_SqlRSSetup.Integration.Tests.ps1

Lines changed: 3 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -178,46 +178,11 @@ Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2017',
178178
-and $_.ResourceId -eq $resourceId
179179
}
180180

181+
## Uncomment this line to see the registry key values.
182+
#Write-Verbose -Message ((reg query "HKLM\SOFTWARE\Microsoft\Microsoft SQL Server" /s) | Out-String) -Verbose
183+
181184
$resourceCurrentState.InstanceName | Should -Be $ConfigurationData.AllNodes.InstanceName
182185
$resourceCurrentState.InstallFolder | Should -Be $ConfigurationData.AllNodes.InstallFolder
183-
184-
if (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2017')
185-
{
186-
## Uncomment this line to see the registry key values.
187-
#Write-Verbose -Message ((reg query "HKLM\SOFTWARE\Microsoft\Microsoft SQL Server" /s) | Out-String) -Verbose
188-
189-
<#
190-
THIS HAS BEEN COMMENTED FROM THE TEST BECAUSE IT IS NOT WORKING PROPERLY.
191-
Maybe due to setup exiting with 3010 (reboot required) and the
192-
registry key not being set yet. Or maybe due to the fact that
193-
the setup does not add a product version.
194-
#>
195-
#$resourceCurrentState.ProductVersion | Should -BeGreaterOrEqual ([System.Version] '14.0.0.0')
196-
}
197-
198-
if (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2019')
199-
{
200-
## Uncomment this line to see the registry key values.
201-
#Write-Verbose -Message ((reg query "HKLM\SOFTWARE\Microsoft\Microsoft SQL Server" /s) | Out-String) -Verbose
202-
203-
$resourceCurrentState.ProductVersion | Should -BeGreaterOrEqual ([System.Version] '15.0.0.0')
204-
}
205-
206-
if (Test-ContinuousIntegrationTaskCategory -Category 'Integration_SQL2022')
207-
{
208-
## Uncomment this line to see the registry key values.
209-
#Write-Verbose -Message ((reg query "HKLM\SOFTWARE\Microsoft\Microsoft SQL Server" /s) | Out-String) -Verbose
210-
211-
$resourceCurrentState.ProductVersion | Should -BeGreaterOrEqual ([System.Version] '16.0.0.0')
212-
}
213-
214-
if (Test-ContinuousIntegrationTaskCategory -Category 'Integration_PowerBI')
215-
{
216-
## Uncomment this line to see the registry key values.
217-
#Write-Verbose -Message ((reg query "HKLM\SOFTWARE\Microsoft\Microsoft SQL Server" /s) | Out-String) -Verbose
218-
219-
$resourceCurrentState.ProductVersion | Should -BeGreaterOrEqual ([System.Version] '1.22.9153.7886')
220-
}
221186
}
222187

223188
It 'Should return $true when Test-DscConfiguration is run' {

0 commit comments

Comments
 (0)