jgaunt/duplicacy
1
0
Fork 0
mirror of https://github.com/gilbertchen/duplicacy synced 2025-12-15 07:43:21 +00:00
Code Issues Releases Wiki Activity

Add/rearrange returns to keep the compiler from complaining.

Browse Source
This commit is contained in:
Mark Feit
2018-02-10 10:15:40 -05:00
parent b52d6b3f7f
commit cc6e96527e
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/duplicacy_storage_test.go
View File

@@ -80,9 +80,11 @@ func loadStorage(localStoragePath string, threads int) (Storage, error) {
return storage, err return storage, err
} else if testStorageName == "s3" { } else if testStorageName == "s3" {
storage, err := CreateS3Storage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads, true, false) storage, err := CreateS3Storage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads, true, false)
return storage, err
storage.SetDefaultNestingLevels([]int{2, 3}, 2) storage.SetDefaultNestingLevels([]int{2, 3}, 2)
} else if testStorageName == "wasabi" { } else if testStorageName == "wasabi" {
storage, err := CreateWasabiStorage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads) storage, err := CreateWasabiStorage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads)
return storage, err
storage.SetDefaultNestingLevels([]int{2, 3}, 2) storage.SetDefaultNestingLevels([]int{2, 3}, 2)
} else if testStorageName == "s3c" { } else if testStorageName == "s3c" {
storage, err := CreateS3CStorage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads) storage, err := CreateS3CStorage(config["region"], config["endpoint"], config["bucket"], config["directory"], config["access_key"], config["secret_key"], threads)
@@ -140,9 +142,9 @@ func loadStorage(localStoragePath string, threads int) (Storage, error) {
storage, err := CreateHubicStorage(config["token_file"], config["storage_path"], threads) storage, err := CreateHubicStorage(config["token_file"], config["storage_path"], threads)
storage.SetDefaultNestingLevels([]int{2, 3}, 2) storage.SetDefaultNestingLevels([]int{2, 3}, 2)
return storage, err return storage, err
} else {
return nil, fmt.Errorf("Invalid storage named: %s", testStorageName)
} }
return nil, fmt.Errorf("Invalid storage named: %s", testStorageName)
} }
func cleanStorage(storage Storage) { func cleanStorage(storage Storage) {
@@ -585,7 +587,6 @@ func TestCleanStorage(t *testing.T) {
storage.DeleteFile(0, "config") storage.DeleteFile(0, "config")
LOG_INFO("DELETE_FILE", "Deleted config") LOG_INFO("DELETE_FILE", "Deleted config")
files, _, err := storage.ListFiles(0, "chunks/") files, _, err := storage.ListFiles(0, "chunks/")
for _, file := range files { for _, file := range files {
if len(file) > 0 && file[len(file)-1] != '/' { if len(file) > 0 && file[len(file)-1] != '/' {