beenull/sftpgo-mirror
1
0
Fork 0
mirror of https://github.com/drakkan/sftpgo.git synced 2024-11-25 00:50:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

sftpd_test: use path.Join for SFTP/SCP path

Browse source 
filepath.Join could use an OS dependent separator
This commit is contained in:
Nicola Murino 2019-10-16 12:57:06 +02:00
parent 8682ae4a54
commit 44d403cf9c
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sftpd/sftpd_test.go
View file

@ -399,7 +399,7 @@ func TestRemove(t *testing.T) {
if err != nil {
t.Errorf("unable to create test file: %v", err)
}
err = sftpUploadFile(testFilePath, filepath.Join("/test", testFileName), testFileSize, client)
err = sftpUploadFile(testFilePath, path.Join("/test", testFileName), testFileSize, client)
if err != nil {
t.Errorf("file upload error: %v", err)
}
@ -407,15 +407,15 @@ func TestRemove(t *testing.T) {
if err == nil {
t.Errorf("remove non empty dir must fail")
}
err = client.RemoveDirectory(filepath.Join("/test", testFileName))
err = client.RemoveDirectory(path.Join("/test", testFileName))
if err == nil {
t.Errorf("remove directory as file must fail")
}
err = client.Remove(filepath.Join("/test", testFileName))
err = client.Remove(path.Join("/test", testFileName))
if err != nil {
t.Errorf("remove file error: %v", err)
}
err = client.Remove(filepath.Join("/test", testFileName))
err = client.Remove(path.Join("/test", testFileName))
if err == nil {
t.Errorf("remove missing file must fail")
}
@ -580,7 +580,7 @@ func TestEscapeHomeDir(t *testing.T) {
if err != nil {
t.Errorf("unable to create test file: %v", err)
}
remoteDestPath := filepath.Join("..", "..", testFileName)
remoteDestPath := path.Join("..", "..", testFileName)
err = sftpUploadFile(testFilePath, remoteDestPath, testFileSize, client)
if err != nil {
t.Errorf("file upload error: %v", err)
@ -1728,7 +1728,7 @@ func TestSCPUploadFileOverwrite(t *testing.T) {
if err != nil {
t.Errorf("unable to create test file: %v", err)
}
remoteUpPath := fmt.Sprintf("%v@127.0.0.1:%v", user.Username, filepath.Join("/", testFileName))
remoteUpPath := fmt.Sprintf("%v@127.0.0.1:%v", user.Username, path.Join("/", testFileName))
err = scpUpload(testFilePath, remoteUpPath, true, false)
if err != nil {
t.Errorf("error uploading file via scp: %v", err)