diff --git a/CHANGELOG.md b/CHANGELOG.md index cb72a82f6..73cfbb2ec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - SqlServerDsc - Update `appveyor.yml` to use `dotnet tool install` to install _GitVersion_. + - Re-enable integration tests for SqlRSSetup and SqlRS when running against + SQL Server 2019 ([issue #1847](https://github.com/dsccommunity/SqlServerDsc/issues/1847)). - The private function `Import-SQLPSModule` was replaced throughout with the public command `Import-SqlDscPreferredModule` ([issue #1848](https://github.com/dsccommunity/SqlServerDsc/issues/1848)). diff --git a/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 b/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 index aed1c31a4..fa6a1fa69 100644 --- a/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 +++ b/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 @@ -64,7 +64,7 @@ AfterAll { Get-Module -Name 'CommonTestHelper' -All | Remove-Module -Force } -Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', <# 'Integration_SQL2019', #> 'Integration_SQL2022') { +Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2016', 'Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') { BeforeAll { $resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test" } diff --git a/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 b/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 index 18ff9409b..1eddc695c 100644 --- a/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 +++ b/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 @@ -50,9 +50,9 @@ BeforeAll { { <# The version below is what the MS download page said, but the .exe is - reporting 15.0.7842.32355 when used in the integration test. + reporting 15.0.8434.2956 when used in the integration test. #> - $script:mockSourceMediaDisplayName = 'Microsoft SQL Server 2019 Reporting Services (15.0.1102.911 - 6/24/2021)' + $script:mockSourceMediaDisplayName = 'Microsoft SQL Server 2019 Reporting Services (15.0.1102.1047 - 2/6/2023)' $script:mockSourceMediaUrl = 'https://download.microsoft.com/download/1/a/a/1aaa9177-3578-4931-b8f3-373b24f63342/SQLServerReportingServices.exe' } @@ -102,7 +102,7 @@ AfterAll { Older versions of Reporting Services (eg. 2016) are integration tested in separate tests (part of resource SqlSetup). #> -Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2017', <# 'Integration_SQL2019', #> 'Integration_SQL2022') { +Describe "$($script:dscResourceName)_Integration" -Tag @('Integration_SQL2017', 'Integration_SQL2019', 'Integration_SQL2022') { BeforeAll { $resourceId = "[$($script:dscResourceFriendlyName)]Integration_Test" }