Skip to content

Merge 6.0.0 GA changes #5522

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

Merged
TravisEz13 merged 3 commits into from
Nov 21, 2017
Merged

Merge 6.0.0 GA changes #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b667406
Change synopsis of install-powershell.ps1 to reflect that it works cr…
bergmeister Nov 20, 2017
f830c5f
[Feature] Fix AppVeyor Fails (#5520)
markekraus Nov 21, 2017
946339e
Fix docker tests (#5508)
TravisEz13 Nov 21, 2017
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
16 changes: 8 additions & 8 deletions docker/tests/container.tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Describe "Build Linux Containers" -Tags 'Build', 'Linux' {
[Parameter(Mandatory=$true)]
[string]
$name,

[Parameter(Mandatory=$true)]
[string]
$path
Expand All @@ -33,7 +33,7 @@ Describe "Build Windows Containers" -Tags 'Build', 'Windows' {
[Parameter(Mandatory=$true)]
[string]
$name,

[Parameter(Mandatory=$true)]
[string]
$path
Expand Down Expand Up @@ -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'
}
}

Expand All @@ -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 changes: 1 addition & 1 deletion docker/tests/containerTestCommon.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions test/powershell/Modules/Microsoft.PowerShell.Utility/WebCmdlets.Tests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
2 changes: 1 addition & 1 deletion tools/install-powershell.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down