From 6ad698328f25f8944abb60aad92602368d1b7c34 Mon Sep 17 00:00:00 2001 From: Gilbert Chen Date: Sat, 26 Sep 2020 12:01:38 -0400 Subject: [PATCH] Fixed test build errors caused by previous merges --- src/duplicacy_backupmanager_test.go | 8 ++++---- src/duplicacy_entry_test.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/duplicacy_backupmanager_test.go b/src/duplicacy_backupmanager_test.go index 15aeaab..988bf43 100644 --- a/src/duplicacy_backupmanager_test.go +++ b/src/duplicacy_backupmanager_test.go @@ -503,7 +503,7 @@ func TestPersistRestore(t *testing.T) { time.Sleep(time.Duration(delay) * time.Second) cleanStorage(unencStorage) - if !ConfigStorage(unencStorage, 16384, 100, 64*1024, 256*1024, 16*1024, "", nil, false, "") { + if !ConfigStorage(unencStorage, 16384, 100, 64*1024, 256*1024, 16*1024, "", nil, false, "", 0, 0) { t.Errorf("Failed to initialize the unencrypted storage") } time.Sleep(time.Duration(delay) * time.Second) @@ -522,14 +522,14 @@ func TestPersistRestore(t *testing.T) { time.Sleep(time.Duration(delay) * time.Second) cleanStorage(storage) - if !ConfigStorage(storage, 16384, 100, 64*1024, 256*1024, 16*1024, password, unencConfig, true, "") { + if !ConfigStorage(storage, 16384, 100, 64*1024, 256*1024, 16*1024, password, unencConfig, true, "", 0, 0) { t.Errorf("Failed to initialize the encrypted storage") } time.Sleep(time.Duration(delay) * time.Second) // do unencrypted backup SetDuplicacyPreferencePath(testDir + "/repository1/.duplicacy") - unencBackupManager := CreateBackupManager("host1", unencStorage, testDir, "", "", "") + unencBackupManager := CreateBackupManager("host1", unencStorage, testDir, "", "", "", false) unencBackupManager.SetupSnapshotCache("default") SetDuplicacyPreferencePath(testDir + "/repository1/.duplicacy") @@ -539,7 +539,7 @@ func TestPersistRestore(t *testing.T) { // do encrypted backup SetDuplicacyPreferencePath(testDir + "/repository1/.duplicacy") - encBackupManager := CreateBackupManager("host1", storage, testDir, password, "", "") + encBackupManager := CreateBackupManager("host1", storage, testDir, password, "", "", false) encBackupManager.SetupSnapshotCache("default") SetDuplicacyPreferencePath(testDir + "/repository1/.duplicacy") diff --git a/src/duplicacy_entry_test.go b/src/duplicacy_entry_test.go index 246d17d..57d7634 100644 --- a/src/duplicacy_entry_test.go +++ b/src/duplicacy_entry_test.go @@ -264,7 +264,7 @@ func TestEntryExcludeByAttribute(t *testing.T) { for _, file := range DATA { fullPath := filepath.Join(testDir, file) if strings.Contains(file, "exclude") { - xattr.Setxattr(fullPath, AttributeExcludeName, []byte(AttributeExcludeValue)) + xattr.Setxattr(fullPath, "com.apple.metadata:com_apple_backup_excludeItem", []byte("com.apple.backupd")) } }