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

Fixed Scp local copy

Browse Source 
* scp fix

* revert the changes in SCP.Tests.ps1

* add deployment of sshd_config

* update the SCP tests

* revert the change to deploy the sshd_config
This commit is contained in:
Yanbing 2016-12-22 15:21:42 -08:00 committed by Manoj Ampalam
parent d67c7e7c85
commit 15a99f6142
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
regress/pesterTests/SCP.Tests.ps1
View File

@ -82,16 +82,16 @@ Describe "Tests for scp command" -Tags "CI" {
$client.CleanupClient() $client.CleanupClient()
$server.CleanupServer() $server.CleanupServer()
Get-Item $SourceDir | Remove-Item -Recurse -Force -ea silentlycontinue Get-Item $SourceDir | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
Get-Item $DestinationDir | Remove-Item -Recurse -Force -ea silentlycontinue Get-Item $DestinationDir | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
} }
BeforeEach { BeforeAll {
$null = New-Item $DestinationDir -ItemType directory -Force $null = New-Item $DestinationDir -ItemType directory -Force
} }
AfterEach { AfterEach {
Get-ChildItem $DestinationDir -Recurse -Directory | Remove-Item -Recurse -Force -ea silentlycontinue Get-ChildItem $DestinationDir -Recurse | Remove-Item -Recurse -Force -ErrorAction SilentlyContinue
} }
<#Context "SCP usage" { <#Context "SCP usage" {
@ -147,7 +147,7 @@ Describe "Tests for scp command" -Tags "CI" {
#cleanup single signon #cleanup single signon
.\ssh-add.exe -D .\ssh-add.exe -D
} }
It 'File Copy with -S option (positive)' { It 'File Copy with -S option (positive)' {
.\scp -S .\ssh.exe $SourceFilePath "$($server.localAdminUserName)@$($server.MachineName):$DestinationFilePath" .\scp -S .\ssh.exe $SourceFilePath "$($server.localAdminUserName)@$($server.MachineName):$DestinationFilePath"
@ -156,18 +156,18 @@ Describe "Tests for scp command" -Tags "CI" {
$equal | Should Be $true $equal | Should Be $true
} }
<#It 'File Copy with -p -c -v option: <Title> ' -TestCases:$testData { It 'File Copy with -p -c -v option: <Title> ' -TestCases:$testData {
param([string]$Title, $Source, $Destination) param([string]$Title, $Source, $Destination)
.\scp -p -c aes128-ctr -v -C $Source $Destination .\scp -p -c aes128-ctr -v -C $Source $Destination
#validate file content. DestPath is the path to the file. #validate file content. DestPath is the path to the file.
$equal = @(Compare-Object (Get-ChildItem -path $SourceFilePath) (Get-ChildItem -path $DestinationFilePath) -Property Name, Length, LastWriteTime.DateTime).Length -eq 0 $equal = @(Compare-Object (Get-ChildItem -path $SourceFilePath) (Get-ChildItem -path $DestinationFilePath) -Property Name, Length, LastWriteTime.DateTime).Length -eq 0
$equal | Should Be $true $equal | Should Be $true
}#> }
It 'Directory recursive Copy with -r -p -v option: <Title> ' -TestCases:$testData1 { It 'Directory recursive Copy with -r -p -v option: <Title> ' -TestCases:$testData1 {
param([string]$Title, $Source, $Destination) param([string]$Title, $Source, $Destination)
.\scp -r -p -v $Source $Destination .\scp -r -p -c aes128-ctr -v $Source $Destination
$equal = @(Compare-Object (Get-Item -path $SourceDir ) (Get-Item -path (join-path $DestinationDir $SourceDirName) ) -Property Name, Length).Length -eq 0 $equal = @(Compare-Object (Get-Item -path $SourceDir ) (Get-Item -path (join-path $DestinationDir $SourceDirName) ) -Property Name, Length).Length -eq 0
$equal | Should Be $true $equal | Should Be $true

2
scp.c
View File

@ -830,7 +830,7 @@ tolocal(int argc, char **argv)
exists = stat(argv[i], &stb) == 0; exists = stat(argv[i], &stb) == 0;
/* convert '/' to '\\' */ /* convert '/' to '\\' */
convertToBackslash(argv[i]); convertToBackslash(argv[i]);
convertToBackslash(argv[i - 1]); convertToBackslash(argv[argc - 1]);
if (exists && (S_ISDIR(stb.st_mode))) { if (exists && (S_ISDIR(stb.st_mode))) {
addargs(&alist, "%s", _PATH_XCOPY); addargs(&alist, "%s", _PATH_XCOPY);
if (iamrecursive) if (iamrecursive)