From 4adaf731a473e39a2045d144012dec31e33afa08 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 21 Nov 2017 14:33:44 -0800 Subject: [PATCH] Fix docker tests (#5508) * update expected version * update container list --- docker/tests/container.tests.ps1 | 16 ++++++++-------- docker/tests/containerTestCommon.psm1 | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docker/tests/container.tests.ps1 b/docker/tests/container.tests.ps1 index ea6a694bb7..591144b4a5 100644 --- a/docker/tests/container.tests.ps1 +++ b/docker/tests/container.tests.ps1 @@ -14,7 +14,7 @@ Describe "Build Linux Containers" -Tags 'Build', 'Linux' { [Parameter(Mandatory=$true)] [string] $name, - + [Parameter(Mandatory=$true)] [string] $path @@ -33,7 +33,7 @@ Describe "Build Windows Containers" -Tags 'Build', 'Windows' { [Parameter(Mandatory=$true)] [string] $name, - + [Parameter(Mandatory=$true)] [string] $path @@ -62,19 +62,19 @@ Describe "Linux Containers run PowerShell" -Tags 'Behavior', 'Linux' { Remove-Item $testContext.resolvedXmlPath -ErrorAction SilentlyContinue Remove-Item $testContext.resolvedLogPath -ErrorAction SilentlyContinue } - + it "Get PSVersion table from $(Get-RepoName):" -TestCases $script:linuxContainerTests -Skip:$script:skipLinux { param( [Parameter(Mandatory=$true)] [string] $name, - + [Parameter(Mandatory=$true)] [string] $path ) - Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.0-beta' + Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.0-rc' } } @@ -87,18 +87,18 @@ Describe "Windows Containers run PowerShell" -Tags 'Behavior', 'Windows' { Remove-Item $testContext.resolvedXmlPath -ErrorAction SilentlyContinue Remove-Item $testContext.resolvedLogPath -ErrorAction SilentlyContinue } - + it "Get PSVersion table from $(Get-RepoName):" -TestCases $script:windowsContainerTests -skip:$script:skipWindows { param( [Parameter(Mandatory=$true)] [string] $name, - + [Parameter(Mandatory=$true)] [string] $path ) - Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.0-beta' + Get-ContainerPowerShellVersion -TestContext $testContext -Name $Name -RepoName (Get-RepoName) | should be '6.0.0-rc' } } diff --git a/docker/tests/containerTestCommon.psm1 b/docker/tests/containerTestCommon.psm1 index b8669ad25d..207187be2a 100644 --- a/docker/tests/containerTestCommon.psm1 +++ b/docker/tests/containerTestCommon.psm1 @@ -65,7 +65,7 @@ function Invoke-Docker # Return a list of Linux Container Test Cases function Get-LinuxContainer { - foreach($os in 'amazonlinux','centos7','opensuse42.2','ubuntu14.04','ubuntu16.04') + foreach($os in 'centos7','ubuntu14.04','ubuntu16.04') { Write-Output @{ Name = $os