From b6674060c8faf1f56ed784605409fc3e21ffdb08 Mon Sep 17 00:00:00 2001 From: bergmeister Date: Mon, 20 Nov 2017 20:28:17 +0000 Subject: [PATCH 1/3] Change synopsis of install-powershell.ps1 to reflect that it works cross-platform (#5465) --- tools/install-powershell.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/install-powershell.ps1 b/tools/install-powershell.ps1 index 8a69fb7e654..d614d512d6e 100644 --- a/tools/install-powershell.ps1 +++ b/tools/install-powershell.ps1 @@ -1,6 +1,6 @@ <# .Synopsis - Install PowerShell Core on Windows. + Install PowerShell Core on Windows, Linux or macOS. .DESCRIPTION By default, the latest PowerShell Core release package will be installed. If '-Daily' is specified, then the latest PowerShell Core daily package will be installed. From f830c5f8e1e2b62912e2b86d0b67fff4277c5e5d Mon Sep 17 00:00:00 2001 From: Mark Kraus Date: Tue, 21 Nov 2017 15:09:27 -0600 Subject: [PATCH 2/3] [Feature] Fix AppVeyor Fails (#5520) --- .../Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 index dc3bdce61ed..656d0bec69f 100644 --- a/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 +++ b/test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1 @@ -2740,22 +2740,22 @@ Describe "Validate Invoke-WebRequest and Invoke-RestMethod -InFile" -Tags "Featu Describe "Web cmdlets tests using the cmdlet's aliases" -Tags "CI" { BeforeAll { - $response = Start-HttpListener -Port 8082 + $response = Start-HttpListener -Port 8079 } AfterAll { - $null = Stop-HttpListener -Port 8082 + $null = Stop-HttpListener -Port 8079 $response.PowerShell.Dispose() } It "Execute Invoke-WebRequest" { - $result = iwr "http://localhost:8082/PowerShell?test=response&output=hello" -TimeoutSec 5 + $result = iwr "http://localhost:8079/PowerShell?test=response&output=hello" -TimeoutSec 5 $result.StatusCode | Should Be "200" $result.Content | Should Be "hello" } It "Execute Invoke-RestMethod" { - $result = irm "http://localhost:8082/PowerShell?test=response&output={%22hello%22:%22world%22}&contenttype=application/json" -TimeoutSec 5 + $result = irm "http://localhost:8079/PowerShell?test=response&output={%22hello%22:%22world%22}&contenttype=application/json" -TimeoutSec 5 $result.Hello | Should Be "world" } } From 946339e1d8d02dcbc323e58d3be1483778935fc8 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 21 Nov 2017 14:33:44 -0800 Subject: [PATCH 3/3] 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 ea6a694bb74..591144b4a5f 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 b8669ad25d6..207187be2a6 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