Skip to content

Commit 8981035

Browse files
authored
Update build script path in integration tests (#2075)
<!-- Thanks for submitting a Pull Request (PR) to this project. Your contribution to this project is greatly appreciated! Please prefix the PR title with the resource name, e.g. 'ResourceName: My short description'. If this is a breaking change, then also prefix the PR title with 'BREAKING CHANGE:', e.g. 'BREAKING CHANGE: ResourceName: My short description'. You may remove this comment block, and the other comment blocks, but please keep the headers and the task list. --> #### Pull Request (PR) description <!-- Replace this comment block with a description of your PR. Also, make sure you have updated the CHANGELOG.md, see the task list below. An entry in the CHANGELOG.md is mandatory for all PRs. --> #### This Pull Request (PR) fixes the following issues None. #### Task list <!-- To aid community reviewers in reviewing and merging your PR, please take the time to run through the below checklist and make sure your PR has everything updated as required. Change to [x] for each task in the task list that applies to your PR. For those task that don't apply to you PR, leave those unchecked. --> - [x] Added an entry to the change log under the Unreleased section of the file CHANGELOG.md. Entry should say what was changed and how that affects users (if applicable), and reference the issue being resolved (if applicable). - [ ] Resource documentation updated in the resource's README.md. - [ ] Resource parameter descriptions updated in schema.mof. - [ ] Comment-based help updated, including parameter descriptions. - [ ] Localization strings updated. - [ ] Examples updated. - [ ] Unit tests updated. See [DSC Community Testing Guidelines](https://dsccommunity.org/guidelines/testing-guidelines). - [x] Integration tests updated (where possible). See [DSC Community Testing Guidelines](https://dsccommunity.org/guidelines/testing-guidelines). - [ ] Code changes adheres to [DSC Community Style Guidelines](https://dsccommunity.org/styleguidelines). <!-- Reviewable:start --> - - - This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/dsccommunity/SqlServerDsc/2075) <!-- Reviewable:end -->
1 parent ed70887 commit 8981035

File tree

39 files changed

+39
-38
lines changed

39 files changed

+39
-38
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4040
- Integration_Test_Resources_SqlServer_dbatools
4141
- Integration_Test_Resources_ReportingServices
4242
- Integration_Test_Resources_ReportingServices_dbatools
43+
- Update build script path in integration tests.
4344
- SqlSetup
4445
- Fixed issue with AddNode where cluster IP information was not being passed to
4546
setup.exe ([issue #1171](https://github.com/dsccommunity/SqlServerDsc/issues/1171)).

tests/Integration/Commands/Connect-SqlDscDatabaseEngine.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Install-SqlDscBIReportServer.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Install-SqlDscReportingService.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Install-SqlDscServer.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Prerequisites.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Repair-SqlDscBIReportServer.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Repair-SqlDscReportingService.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Uninstall-SqlDscBIReportServer.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

tests/Integration/Commands/Uninstall-SqlDscReportingService.Integration.Tests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ BeforeDiscovery {
1010
if (-not (Get-Module -Name 'DscResource.Test' -ListAvailable))
1111
{
1212
# Redirect all streams to $null, except the error stream (stream 2)
13-
& "$PSScriptRoot/../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
13+
& "$PSScriptRoot/../../../build.ps1" -Tasks 'noop' 2>&1 4>&1 5>&1 6>&1 > $null
1414
}
1515

1616
# If the dependencies has not been resolved, this will throw an error.

0 commit comments

Comments
 (0)