Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
  • Loading branch information
potatoqualitee committed Oct 21, 2024
1 parent 1b90a81 commit 950686a
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions tests/New-DbaSsisCatalog.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
Context "Catalog is added properly" {
# database name is currently fixed
$database = "SSISDB"
$db = Get-DbaDatabase -SqlInstance $ssisserver -Database $database
$db = Get-DbaDatabase -SqlInstance $TestConfig.ssisserver -Database $database

if (-not $db) {
$password = ConvertTo-SecureString MyVisiblePassWord -AsPlainText -Force
$results = New-DbaSsisCatalog -SqlInstance $ssisserver -Password $password -WarningAction SilentlyContinue -WarningVariable warn
$results = New-DbaSsisCatalog -SqlInstance $TestConfig.ssisserver -Password $password -WarningAction SilentlyContinue -WarningVariable warn

# Run the tests only if it worked (this could be more accurate but w/e, it's hard to test on appveyor)
if ($warn -match "not running") {
Expand All @@ -36,7 +36,7 @@ Describe "$CommandName Integration Tests" -Tags "IntegrationTests" {
It "creates the catalog" {
$results.Created | Should Be $true
}
Remove-DbaDatabase -Confirm:$false -SqlInstance $ssisserver -Database $database
Remove-DbaDatabase -Confirm:$false -SqlInstance $TestConfig.ssisserver -Database $database
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions tests/Test-DbaDiskSpeed.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
$results = @($TestConfig.instance1, $TestConfig.instance2) | Test-DbaDiskSpeed -Database master
$results.Count | Should -Be 4

# for some reason this doesn't work on AppVeyor, perhaps due to the way the instances are started up the instance names do not match the values in constants.ps1
# for some reason this doesn't work on AppVeyor, perhaps due to the way the instances are started up the instance names do not match the values in Get-TestConfig
#(($results.SqlInstance -contains $TestConfig.instance1) -and ($results.SqlInstance -contains $TestConfig.instance2)) | Should -Be $true
}

Expand Down Expand Up @@ -181,7 +181,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
}

# Separate test to run against a Linux-hosted SQL instance.
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the constants.ps1
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the Get-TestConfig
It -Skip "test commands on a Linux instance" {
# use instance with credential info and run through the 3 variations
# -Skip to be added when checking in the code
Expand All @@ -207,7 +207,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
}

# Separate test to run against a Linux-hosted SQL instance.
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the constants.ps1
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the Get-TestConfig
It -Skip "aggregate by file and check column names returned on a Linux instance" {
# check returned columns
[object[]]$expectedColumnArray = 'ComputerName', 'InstanceName', 'SqlInstance', 'Database', 'SizeGB', 'FileName', 'FileID', 'FileType', 'DiskLocation', 'Reads', 'AverageReadStall', 'ReadPerformance', 'Writes', 'AverageWriteStall', 'WritePerformance', 'Avg Overall Latency', 'Avg Bytes/Read', 'Avg Bytes/Write', 'Avg Bytes/Transfer'
Expand Down Expand Up @@ -247,7 +247,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
}

# Separate test to run against a Linux-hosted SQL instance.
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the constants.ps1
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the Get-TestConfig
It -Skip "aggregate by database and check column names returned on a Linux instance" {
# check returned columns
[object[]]$expectedColumnArray = 'ComputerName', 'InstanceName', 'SqlInstance', 'Database', 'DiskLocation', 'Reads', 'AverageReadStall', 'ReadPerformance', 'Writes', 'AverageWriteStall', 'WritePerformance', 'Avg Overall Latency', 'Avg Bytes/Read', 'Avg Bytes/Write', 'Avg Bytes/Transfer'
Expand Down Expand Up @@ -287,7 +287,7 @@ Describe "$CommandName Integration Tests" -Tag "IntegrationTests" {
}

# Separate test to run against a Linux-hosted SQL instance.
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the constants.ps1
# To run this test ensure you have specified the instance2 values for a Linux-hosted SQL instance in the Get-TestConfig
It -Skip "aggregate by disk and check column names returned on a Linux instance" {
# check returned columns
[object[]]$expectedColumnArray = 'ComputerName', 'InstanceName', 'SqlInstance', 'DiskLocation', 'Reads', 'AverageReadStall', 'ReadPerformance', 'Writes', 'AverageWriteStall', 'WritePerformance', 'Avg Overall Latency', 'Avg Bytes/Read', 'Avg Bytes/Write', 'Avg Bytes/Transfer'
Expand Down

0 comments on commit 950686a

Please sign in to comment.