Skip to content

Remove errors in counter tests on non-Windows #2914

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

Closed
iSazonov wants to merge 2 commits into from
Closed

Remove errors in counter tests on non-Windows #2914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1a425b
Remove errors in counter tests
iSazonov Dec 21, 2016
9ef9cae
Add performance optimizations
iSazonov Dec 22, 2016
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
11 changes: 0 additions & 11 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/CounterTestHelperFunctions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,14 +278,3 @@ function CompareCounterSets
}
}
}

function SkipCounterTests
{
if ([System.Management.Automation.Platform]::IsLinux -or
[System.Management.Automation.Platform]::IsOSX)
{
return $true
}

return $false
}
49 changes: 38 additions & 11 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Export-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,19 @@ $cmdletName = "Export-Counter"

$rootFilename = "exportedCounters"
$filePath = $null
$counterNames = @(
(TranslateCounterPath "\Memory\Available Bytes")
(TranslateCounterPath "\Processor(*)\% Processor Time")
(TranslateCounterPath "\Processor(_Total)\% Processor Time")
(TranslateCounterPath "\PhysicalDisk(_Total)\Current Disk Queue Length")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Bytes/sec")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec")
)

if ( $isWindows ) {

$counterNames = @(
(TranslateCounterPath "\Memory\Available Bytes")
(TranslateCounterPath "\Processor(*)\% Processor Time")
(TranslateCounterPath "\Processor(_Total)\% Processor Time")
(TranslateCounterPath "\PhysicalDisk(_Total)\Current Disk Queue Length")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Bytes/sec")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec")
)
}

$counterValues = $null

# Test the results of Export-Counter by importing the exported
Expand All @@ -31,7 +36,7 @@ function CheckExportResults
# Run a test case
function RunTest($testCase)
{
It "$($testCase.Name)" -Skip:$(SkipCounterTests) {
It "$($testCase.Name)" {
$getCounterParams = ""
if ($testCase.ContainsKey("GetCounterParams"))
{
Expand Down Expand Up @@ -116,19 +121,30 @@ function RunTest($testCase)
Describe "CI tests for Export-Counter cmdlet" -Tags "CI" {

BeforeAll {
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
}
$script:outputDirectory = $testDrive
}

AfterAll {
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
}
}

$testCases = @(
@{
Name = "Can export BLG format"
FileFormat = "blg"
GetCounterParams = "-MaxSamples 5"
GetCounterParams = "-MaxSamples 2"
Script = { CheckExportResults }
}
@{
Name = "Exports BLG format by default"
GetCounterParams = "-MaxSamples 5"
GetCounterParams = "-MaxSamples 2"
Script = { CheckExportResults }
}
)
Expand All @@ -142,9 +158,20 @@ Describe "CI tests for Export-Counter cmdlet" -Tags "CI" {
Describe "Feature tests for Export-Counter cmdlet" -Tags "Feature" {

BeforeAll {
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
}
$script:outputDirectory = $testDrive
}

AfterAll {
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
}
}

Context "Validate incorrect parameter usage" {
$testCases = @(
@{
Expand Down
58 changes: 45 additions & 13 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Get-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,22 @@ $cmdletName = "Get-Counter"
. "$PSScriptRoot/CounterTestHelperFunctions.ps1"

$badName = "bad-name-DAD288C0-72F8-47D3-8C54-C69481B528DF"
$counterPaths = @{
MemoryBytes = TranslateCounterPath "\Memory\Available Bytes"
TotalDiskRead = TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec"
Unknown = TranslateCounterPath "\Memory\$badName"
Bad = $badName

if ( $isWindows ) {

$counterPaths = @{
MemoryBytes = TranslateCounterPath "\Memory\Available Bytes"
TotalDiskRead = TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec"
Unknown = TranslateCounterPath "\Memory\$badName"
Bad = $badName
}
}

$nonEnglishCulture = (-not (Get-Culture).Name.StartsWith("en-", [StringComparison]::InvariantCultureIgnoreCase))

function ValidateParameters($testCase)
{
It "$($testCase.Name)" -Skip:$(SkipCounterTests) {
It "$($testCase.Name)" {

# build up a command
$counterParam = ""
Expand All @@ -45,13 +49,27 @@ function ValidateParameters($testCase)

Describe "CI Tests for Get-Counter cmdlet" -Tags "CI" {

It "Get-Counter with no parameters returns data for a default set of counters" -Skip:$(SkipCounterTests) {
BeforeAll {
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
}
}

AfterAll {
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
}
}

It "Get-Counter with no parameters returns data for a default set of counters" {
$counterData = Get-Counter
# At the very least we should get processor and memory
$counterData.CounterSamples.Length | should BeGreaterThan 1
}

It "Can retrieve the specified counter" -Skip:$(SkipCounterTests) {
It "Can retrieve the specified counter" {
$counterPath = $counterPaths.MemoryBytes
$counterData = Get-Counter -Counter $counterPath
$counterData.Length | Should Be 1
Expand All @@ -62,6 +80,20 @@ Describe "CI Tests for Get-Counter cmdlet" -Tags "CI" {

Describe "Feature tests for Get-Counter cmdlet" -Tags "Feature" {

BeforeAll {
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
}
}

AfterAll {
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
}
}

Context "Validate incorrect parameter usage" {
$parameterTestCases = @(
@{
Expand Down Expand Up @@ -167,14 +199,14 @@ Describe "Feature tests for Get-Counter cmdlet" -Tags "Feature" {

Context "Get-Counter CounterSet tests" {

It "Can retrieve the specified number of counter samples" -Skip:$(SkipCounterTests) {
It "Can retrieve the specified number of counter samples" {
$counterPath = $counterPaths.MemoryBytes
$counterCount = 5
$counterData = Get-Counter -Counter $counterPath -MaxSamples $counterCount
$counterData.Length | Should Be $counterCount
}

It "Can specify the sample interval" -Skip:$(SkipCounterTests) {
It "Can specify the sample interval" {
$counterPath = TranslateCounterPath "\PhysicalDisk(*)\Current Disk Queue Length"
$counterCount = 5
$sampleInterval = 2
Expand All @@ -185,7 +217,7 @@ Describe "Feature tests for Get-Counter cmdlet" -Tags "Feature" {
($endTime - $startTime).TotalSeconds | Should Not BeLessThan ($counterCount * $sampleInterval)
}

It "Can process array of counter names" -Skip:$(SkipCounterTests) {
It "Can process array of counter names" {
$counterPaths = @((TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec"),
(TranslateCounterPath "\Memory\Available bytes"))
$counterData = Get-Counter -Counter $counterPaths
Expand All @@ -194,14 +226,14 @@ Describe "Feature tests for Get-Counter cmdlet" -Tags "Feature" {
}

Context "Get-Counter ListSet tests" {
It "Can retrieve specified counter set" -Skip:$(SkipCounterTests) {
It "Can retrieve specified counter set" {
$counterSetName = "Memory"
$counterSet = Get-Counter -ListSet $counterSetName
$counterSet.Length | Should Be 1
$counterSet.CounterSetName | Should Be $counterSetName
}

It "Can process an array of counter set names" -Skip:$(SkipCounterTests) {
It "Can process an array of counter set names" {
$counterSetNames = @("Memory", "Processor")
$counterSets = Get-Counter -ListSet $counterSetNames
$counterSets.Length | Should Be 2
Expand Down
59 changes: 40 additions & 19 deletions test/powershell/Modules/Microsoft.PowerShell.Diagnostics/Import-Counter.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@ $cmdletName = "Import-Counter"

. "$PSScriptRoot/CounterTestHelperFunctions.ps1"

$counterPaths = @(
(TranslateCounterPath "\Memory\Available Bytes")
(TranslateCounterPath "\processor(*)\% Processor time")
(TranslateCounterPath "\Processor(_Total)\% Processor Time")
(TranslateCounterPath "\PhysicalDisk(_Total)\Current Disk Queue Length")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Bytes/sec")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec")
)
$setNames = @{
Memory = (TranslateCounterName "memory")
PhysicalDisk = (TranslateCounterName "physicaldisk")
Processor = (TranslateCounterName "processor")
if ( $isWindows ) {

$counterPaths = @(
(TranslateCounterPath "\Memory\Available Bytes")
(TranslateCounterPath "\processor(*)\% Processor time")
(TranslateCounterPath "\Processor(_Total)\% Processor Time")
(TranslateCounterPath "\PhysicalDisk(_Total)\Current Disk Queue Length")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Bytes/sec")
(TranslateCounterPath "\PhysicalDisk(_Total)\Disk Read Bytes/sec")
)
$setNames = @{
Memory = (TranslateCounterName "memory")
PhysicalDisk = (TranslateCounterName "physicaldisk")
Processor = (TranslateCounterName "processor")
}
}

$badSamplesBlgPath = Join-Path $PSScriptRoot "assets" "BadCounterSamples.blg"
Expand Down Expand Up @@ -88,7 +91,7 @@ function ConstructCommand($testCase)
# Run a test that is expected to succeed
function RunTest($testCase)
{
$skipTest = $testCase.SkipTest -or (SkipCounterTests)
$skipTest = $testCase.SkipTest -or ( ! $isWindows )

It "$($testCase.Name)" -Skip:$skipTest {

Expand All @@ -110,7 +113,6 @@ function RunTest($testCase)
}

$cmd = ConstructCommand $testCase
Write-Host "Command to run: $cmd"
$cmd = $cmd + " -ErrorAction SilentlyContinue -ErrorVariable errVar"

$errVar = $null
Expand Down Expand Up @@ -221,7 +223,18 @@ function RunExpectedFailureTest($testCase)
Describe "CI tests for Import-Counter cmdlet" -Tags "CI" {

BeforeAll {
SetScriptVars $testDrive 0 $false
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
SetScriptVars $testDrive 0 $false
}
}

AfterAll {
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
}
}

$performatTestCases = @(
Expand Down Expand Up @@ -253,13 +266,21 @@ Describe "CI tests for Import-Counter cmdlet" -Tags "CI" {
Describe "Feature tests for Import-Counter cmdlet" -Tags "Feature" {

BeforeAll {
SetScriptVars $testDrive 25 $true
if ( ! $IsWindows )
{
$origDefaults = $PSDefaultParameterValues.Clone()
$PSDefaultParameterValues['it:skip'] = $true
SetScriptVars $testDrive 25 $true
}
}

AfterAll {
Remove-Item $script:blgPath -Force -ErrorAction SilentlyContinue
Remove-Item $script:csvPath -Force -ErrorAction SilentlyContinue
Remove-Item $script:tsvPath -Force -ErrorAction SilentlyContinue
if ( ! $IsWindows ){
$global:PSDefaultParameterValues = $origDefaults
Remove-Item $script:blgPath -Force -ErrorAction SilentlyContinue
Remove-Item $script:csvPath -Force -ErrorAction SilentlyContinue
Remove-Item $script:tsvPath -Force -ErrorAction SilentlyContinue
}
}

Context "Validate incorrect usage" {
Expand Down