Skip to content

Commit

Permalink
SqlAlwaysOnService: Resolve failing integration test (#1169)
Browse files Browse the repository at this point in the history
- Changes to SqlAlwaysOnService
  - Integration tests was updated to handle new IPv6 addresses on the AppVeyor build worker (issue #1155).
  • Loading branch information
johlju authored Jun 30, 2018
1 parent 4f9abea commit 9b6f768
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

- Changes to SqlAlwaysOnService
- Integration tests was updated to handle new IPv6 addresses on the AppVeyor
build worker ([issue #1155](https://github.com/PowerShell/SqlServerDsc/issues/1155)).

## 11.3.0.0

- Changes to SqlServerDsc
Expand Down
8 changes: 5 additions & 3 deletions Tests/Integration/MSFT_SqlAlwaysOnService.config.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@
Get all adapters with static IP addresses, all of which should be ignored
when creating the cluster.
#>

$ignoreAdapterIpAddress = Get-NetAdapter |
Get-NetIPInterface |
Where-Object -FilterScript {
$_.Dhcp -eq 'Disabled'
$_.AddressFamily -eq 'IPv4' `
-and $_.Dhcp -eq 'Disabled'
} | Get-NetIPAddress

$ignoreIpNetwork = @()
Expand Down Expand Up @@ -72,7 +74,7 @@ Configuration MSFT_SqlAlwaysOnService_CreateDependencies_Config
#>
xDefaultGatewayAddress LoopbackAdapterIPv4DefaultGateway
{
Address = $Node.LoopbackAdapterGateway
Address = $Node.LoopbackAdapterGateway
InterfaceAlias = $Node.LoopbackAdapterName
AddressFamily = 'IPv4'
}
Expand Down Expand Up @@ -153,7 +155,7 @@ Configuration MSFT_SqlAlwaysOnService_CreateDependencies_Config
}
}

DependsOn = @(
DependsOn = @(
'[WindowsFeature]AddFeatureFailoverClustering'
'[WindowsFeature]AddFeatureFailoverClusteringPowerShellModule'
)
Expand Down

0 comments on commit 9b6f768

Please sign in to comment.