Win7/PowerShell7
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix docker tests (#5508)

Browse Source 
* update expected version
* update container list
This commit is contained in:
Travis Plunk 2017-11-21 13:52:10 -08:00 committed by GitHub
parent e1a57e5194
commit 227da48490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
docker/tests/container.tests.ps1
View File

@ -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):<Name>" -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):<Name>" -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'
}
}

2
docker/tests/containerTestCommon.psm1
View File

@ -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