Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SqlRs and SqlRSSetup: re-enable integration tests #1849

Merged
merged 6 commits into from
Mar 4, 2023
Merged

SqlRs and SqlRSSetup: re-enable integration tests #1849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e071800
SqlRs and SqlRSSetup: re-enable integration tests (issue #1847)
johlju Feb 6, 2023
c2087ce
Fix version
johlju Feb 7, 2023
7f864fa
DEBUG
johlju Feb 7, 2023
f9b3175
Fix changelog
johlju Mar 1, 2023
7315762
Merge branch 'main' into fix/re-enable-tests
johlju Mar 4, 2023
9453cce
revert appveyor pipeline
johlju Mar 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)).

Expand Down
2 changes: 1 addition & 1 deletion tests/Integration/DSC_SqlRS.Integration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
6 changes: 3 additions & 3 deletions tests/Integration/DSC_SqlRSSetup.Integration.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
}

Expand Down Expand Up @@ -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"
}
Expand Down