From 7d82a242600de027a33635afbb7affed666cd46b Mon Sep 17 00:00:00 2001 From: Johan Ljunggren Date: Mon, 6 Feb 2023 19:39:49 +0100 Subject: [PATCH] SqlRs and SqlRSSetup: re-enable integration tests (issue #1847) --- CHANGELOG.md | 4 ---- tests/Integration/DSC_SqlRS.Integration.Tests.ps1 | 2 +- tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6bc3766dda..73295061a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,10 +37,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - `Get-LocalizedDataRecursive` - Added documentation how to generate stub modules for the unit tests. The documentation can be found in ['tests/Unit/Stubs`](https://github.com/dsccommunity/SqlServerDsc/tree/main/tests/Unit/Stubs). - - SqlRSSetup and SqlRS - - Removed the integration test when running against SQL Server 2019, - due to the URL to download the Reporting Services 2019 executable - no longer works. ### Added diff --git a/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 b/tests/Integration/DSC_SqlRS.Integration.Tests.ps1 index aed1c31a4e..fa6a1fa69f 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 18ff9409ba..babe4db9e4 100644 --- a/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 +++ b/tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1 @@ -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" }