-
-
Notifications
You must be signed in to change notification settings - Fork 771
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
sftpd_test: use path.Join for SFTP/SCP path
filepath.Join could use an OS dependent separator
- Loading branch information
Showing
1 changed file
with
6 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -399,23 +399,23 @@ 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) | ||
| } | ||
| err = client.Remove("/test") | ||
| 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("%[email protected]:%v", user.Username, filepath.Join("/", testFileName)) | ||
| remoteUpPath := fmt.Sprintf("%[email protected]:%v", user.Username, path.Join("/", testFileName)) | ||
| err = scpUpload(testFilePath, remoteUpPath, true, false) | ||
| if err != nil { | ||
| t.Errorf("error uploading file via scp: %v", err) | ||
|
|
||