tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix test failures on win7 (#335)

Browse Source
This commit is contained in:
Yanbing 2018-08-01 12:31:10 -07:00 committed by GitHub
parent 0f9808f190
commit fde0994a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
regress/pesterTests/KeyUtils.Tests.ps1
View File

@ -34,7 +34,7 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
$adminsSid = Get-UserSID -WellKnownSidType ([System.Security.Principal.WellKnownSidType]::BuiltinAdministratorsSid) $adminsSid = Get-UserSID -WellKnownSidType ([System.Security.Principal.WellKnownSidType]::BuiltinAdministratorsSid)
$currentUserSid = Get-UserSID -User "$($env:USERDOMAIN)\$($env:USERNAME)" $currentUserSid = Get-UserSID -User "$($env:USERDOMAIN)\$($env:USERNAME)"
$objUserSid = Get-UserSID -User $ssouser $objUserSid = Get-UserSID -User $ssouser
$everyoneSid = Get-UserSID -WellKnownSidType ([System.Security.Principal.WellKnownSidType]::WorldSid) $everyoneSid = Get-UserSID -WellKnownSidType ([System.Security.Principal.WellKnownSidType]::WorldSid)
function ValidateRegistryACL { function ValidateRegistryACL {
param([string]$UserSid = $currentUserSid, $count) param([string]$UserSid = $currentUserSid, $count)
@ -56,7 +56,7 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
$a.PropagationFlags | Should Be ([System.Security.AccessControl.PropagationFlags]::None) $a.PropagationFlags | Should Be ([System.Security.AccessControl.PropagationFlags]::None)
} }
$entries = Get-ChildItem $agentPath\keys $entries = @(Get-ChildItem $agentPath\keys)
$entries.Count | Should Be $count $entries.Count | Should Be $count
if($count -gt 0) if($count -gt 0)
{ {
@ -241,20 +241,25 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
foreach($type in $keytypes) foreach($type in $keytypes)
{ {
$keyPath = Join-Path $testDir "id_$type" $keyPath = Join-Path $testDir "id_$type"
$keyPathDifferentEnding = Join-Path $testDir "id_$($type)_DifferentEnding"
if((Get-Content -Path $keyPath -raw).Contains("`r`n"))
{
$newcontent = (Get-Content -Path $keyPath -raw).Replace("`r`n", "`n")
}
else
{
$newcontent = (Get-Content -Path $keyPath -raw).Replace("`n", "`r`n")
}
Set-content -Path $keyPathDifferentEnding -value "$newcontent"
Repair-UserKeyPermission $keyPathDifferentEnding -confirm:$false
# for ssh-add to consume SSh_ASKPASS, stdin should not be TTY # for ssh-add to consume SSh_ASKPASS, stdin should not be TTY
iex "cmd /c `"ssh-add $keyPath < $nullFile 2> nul `"" iex "cmd /c `"ssh-add $keyPath < $nullFile 2> nul `""
iex "cmd /c `"ssh-add $keyPathDifferentEnding < $nullFile 2> nul `"" #Check if -Raw presents for Get-Content cmdlet
$rawParam = (get-command Get-Content).Parametersets | Select -ExpandProperty Parameters | ? {$_.Name -ieq "Raw"}
if($rawParam)
{
$keyPathDifferentEnding = Join-Path $testDir "id_$($type)_DifferentEnding"
if((Get-Content -Path $keyPath -raw).Contains("`r`n"))
{
$newcontent = (Get-Content -Path $keyPath -raw).Replace("`r`n", "`n")
}
else
{
$newcontent = (Get-Content -Path $keyPath -raw).Replace("`n", "`r`n")
}
Set-content -Path $keyPathDifferentEnding -value "$newcontent"
Repair-UserKeyPermission $keyPathDifferentEnding -confirm:$false
iex "cmd /c `"ssh-add $keyPathDifferentEnding < $nullFile 2> nul `""
}
} }
#remove SSH_ASKPASS #remove SSH_ASKPASS
@ -290,7 +295,7 @@ Describe "E2E scenarios for ssh key management" -Tags "CI" {
@($allkeys | where { $_.contains($pubkeyraw) }).count | Should Be 0 @($allkeys | where { $_.contains($pubkeyraw) }).count | Should Be 0
} }
$allkeys = ssh-add -L $allkeys = @(ssh-add -L)
ValidateRegistryACL -count $allkeys.count ValidateRegistryACL -count $allkeys.count
} }
} }

2
regress/pesterTests/SSH.Tests.ps1
View File

@ -294,7 +294,7 @@ Describe "E2E scenarios for ssh client" -Tags "CI" {
$nul | Set-Content $kh $nul | Set-Content $kh
# doing via cmd to intercept and drain stderr output # doing via cmd to intercept and drain stderr output
iex "cmd /c `"ssh -o UserKnownHostsFile=`"$kh`" -o StrictHostKeyChecking=no test_target hostname 2>&1`"" iex "cmd /c `"ssh -o UserKnownHostsFile=`"$kh`" -o StrictHostKeyChecking=no test_target hostname 2>&1`""
(Get-Content $kh).Count | Should Be 1 @(Get-Content $kh).Count | Should Be 1
} }
} }