diff --git a/src/duplicacy_acdclient_test.go b/src/duplicacy_acdclient_test.go deleted file mode 100644 index 54f75e2a..00000000 --- a/src/duplicacy_acdclient_test.go +++ /dev/null @@ -1,153 +0,0 @@ -// Copyright (c) Acrosync LLC. All rights reserved. -// Free for personal use and commercial trial -// Commercial use requires per-user licenses available from https://duplicacy.com - -package duplicacy - -import ( - "crypto/sha256" - "encoding/hex" - "fmt" - "io" - "testing" - - crypto_rand "crypto/rand" - "math/rand" -) - -func TestACDClient(t *testing.T) { - - acdClient, err := NewACDClient("acd-token.json") - if err != nil { - t.Errorf("Failed to create the ACD client: %v", err) - return - } - - acdClient.TestMode = true - - rootID, _, _, err := acdClient.ListByName("", "") - if err != nil { - t.Errorf("Failed to get the root node: %v", err) - return - } - - if rootID == "" { - t.Errorf("No root node") - return - } - - testID, _, _, err := acdClient.ListByName(rootID, "test") - if err != nil { - t.Errorf("Failed to list the test directory: %v", err) - return - } - if testID == "" { - testID, err = acdClient.CreateDirectory(rootID, "test") - if err != nil { - t.Errorf("Failed to create the test directory: %v", err) - return - } - } - - test1ID, _, _, err := acdClient.ListByName(testID, "test1") - if err != nil { - t.Errorf("Failed to list the test1 directory: %v", err) - return - } - if test1ID == "" { - test1ID, err = acdClient.CreateDirectory(testID, "test1") - if err != nil { - t.Errorf("Failed to create the test1 directory: %v", err) - return - } - } - - test2ID, _, _, err := acdClient.ListByName(testID, "test2") - if err != nil { - t.Errorf("Failed to list the test2 directory: %v", err) - return - } - if test2ID == "" { - test2ID, err = acdClient.CreateDirectory(testID, "test2") - if err != nil { - t.Errorf("Failed to create the test2 directory: %v", err) - return - } - } - - fmt.Printf("test1: %s, test2: %s\n", test1ID, test2ID) - - numberOfFiles := 20 - maxFileSize := 64 * 1024 - - for i := 0; i < numberOfFiles; i++ { - content := make([]byte, rand.Int()%maxFileSize+1) - _, err = crypto_rand.Read(content) - if err != nil { - t.Errorf("Error generating random content: %v", err) - return - } - - hasher := sha256.New() - hasher.Write(content) - filename := hex.EncodeToString(hasher.Sum(nil)) - - fmt.Printf("file: %s\n", filename) - - _, err = acdClient.UploadFile(test1ID, filename, content, 100) - if err != nil { - /*if e, ok := err.(ACDError); !ok || e.Status != 409 */ { - t.Errorf("Failed to upload the file %s: %v", filename, err) - return - } - } - } - - entries, err := acdClient.ListEntries(test1ID, true, false) - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - err = acdClient.MoveFile(entry.ID, test1ID, test2ID) - if err != nil { - t.Errorf("Failed to move %s: %v", entry.Name, err) - return - } - } - - entries, err = acdClient.ListEntries(test2ID, true, false) - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - readCloser, _, err := acdClient.DownloadFile(entry.ID) - if err != nil { - t.Errorf("Error downloading file %s: %v", entry.Name, err) - return - } - - hasher := sha256.New() - io.Copy(hasher, readCloser) - hash := hex.EncodeToString(hasher.Sum(nil)) - - if hash != entry.Name { - t.Errorf("File %s, hash %s", entry.Name, hash) - } - - readCloser.Close() - } - - for _, entry := range entries { - - err = acdClient.DeleteFile(entry.ID) - if err != nil { - t.Errorf("Failed to delete the file %s: %v", entry.Name, err) - return - } - } - -} diff --git a/src/duplicacy_b2client_test.go b/src/duplicacy_b2client_test.go deleted file mode 100644 index cb9932a4..00000000 --- a/src/duplicacy_b2client_test.go +++ /dev/null @@ -1,133 +0,0 @@ -// Copyright (c) Acrosync LLC. All rights reserved. -// Free for personal use and commercial trial -// Commercial use requires per-user licenses available from https://duplicacy.com - -package duplicacy - -import ( - "crypto/sha256" - "encoding/hex" - "encoding/json" - "testing" - - crypto_rand "crypto/rand" - "io" - "io/ioutil" - "math/rand" -) - -func createB2ClientForTest(t *testing.T) (*B2Client, string) { - config, err := ioutil.ReadFile("test_storage.conf") - if err != nil { - t.Errorf("Failed to read config file: %v", err) - return nil, "" - } - - storages := make(map[string]map[string]string) - - err = json.Unmarshal(config, &storages) - if err != nil { - t.Errorf("Failed to parse config file: %v", err) - return nil, "" - } - - b2, found := storages["b2"] - if !found { - t.Errorf("Failed to find b2 config") - return nil, "" - } - - return NewB2Client(b2["account"], b2["key"], "", b2["directory"], 1), b2["bucket"] - -} - -func TestB2Client(t *testing.T) { - - b2Client, bucket := createB2ClientForTest(t) - if b2Client == nil { - return - } - - b2Client.TestMode = true - - err, _ := b2Client.AuthorizeAccount(0) - if err != nil { - t.Errorf("Failed to authorize the b2 account: %v", err) - return - } - - err = b2Client.FindBucket(bucket) - if err != nil { - t.Errorf("Failed to find bucket '%s': %v", bucket, err) - return - } - - testDirectory := "b2client_test/" - - files, err := b2Client.ListFileNames(0, testDirectory, false, false) - if err != nil { - t.Errorf("Failed to list files: %v", err) - return - } - - for _, file := range files { - err = b2Client.DeleteFile(0, file.FileName, file.FileID) - if err != nil { - t.Errorf("Failed to delete file '%s': %v", file.FileName, err) - } - } - - maxSize := 10000 - for i := 0; i < 20; i++ { - size := rand.Int()%maxSize + 1 - content := make([]byte, size) - _, err := crypto_rand.Read(content) - if err != nil { - t.Errorf("Error generating random content: %v", err) - return - } - - hash := sha256.Sum256(content) - name := hex.EncodeToString(hash[:]) - - err = b2Client.UploadFile(0, testDirectory+name, content, 100) - if err != nil { - t.Errorf("Error uploading file '%s': %v", name, err) - return - } - } - - files, err = b2Client.ListFileNames(0, testDirectory, false, false) - if err != nil { - t.Errorf("Failed to list files: %v", err) - return - } - - for _, file := range files { - - readCloser, _, err := b2Client.DownloadFile(0, file.FileName) - if err != nil { - t.Errorf("Error downloading file '%s': %v", file.FileName, err) - return - } - - defer readCloser.Close() - - hasher := sha256.New() - _, err = io.Copy(hasher, readCloser) - - hash := hex.EncodeToString(hasher.Sum(nil)) - - if testDirectory+hash != file.FileName { - t.Errorf("File %s has hash %s", file.FileName, hash) - } - - } - - for _, file := range files { - err = b2Client.DeleteFile(0, file.FileName, file.FileID) - if err != nil { - t.Errorf("Failed to delete file '%s': %v", file.FileName, err) - } - } -} diff --git a/src/duplicacy_backupmanager_test.go b/src/duplicacy_backupmanager_test.go index 4c552a88..3eb06560 100644 --- a/src/duplicacy_backupmanager_test.go +++ b/src/duplicacy_backupmanager_test.go @@ -358,16 +358,17 @@ func TestBackupManager(t *testing.T) { if numberOfSnapshots != 3 { t.Errorf("Expected 3 snapshots but got %d", numberOfSnapshots) } - backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{1, 2, 3} /*tag*/, "", - /*showStatistics*/ false /*showTabular*/, false /*checkFiles*/, false /*checkChunks*/, false /*searchFossils*/, false /*resurrect*/, false, 1 /*allowFailures*/, false) + + backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{1, 2, 3}, /*tag*/ "", /*showStatistics*/ false, + /*showTabular*/ false, /*checkFiles*/ false, /*checkChunks*/ false, /*searchFossils*/ false, /*resurrect*/ false, /*rewiret*/ false, 1, /*allowFailures*/false) backupManager.SnapshotManager.PruneSnapshots("host1", "host1" /*revisions*/, []int{1} /*tags*/, nil /*retentions*/, nil, /*exhaustive*/ false /*exclusive=*/, false /*ignoredIDs*/, nil /*dryRun*/, false /*deleteOnly*/, false /*collectOnly*/, false, 1) numberOfSnapshots = backupManager.SnapshotManager.ListSnapshots( /*snapshotID*/ "host1" /*revisionsToList*/, nil /*tag*/, "" /*showFiles*/, false /*showChunks*/, false) if numberOfSnapshots != 2 { t.Errorf("Expected 2 snapshots but got %d", numberOfSnapshots) } - backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{2, 3} /*tag*/, "", - /*showStatistics*/ false /*showTabular*/, false /*checkFiles*/, false /*checkChunks*/, false /*searchFossils*/, false /*resurrect*/, false, 1 /*allowFailures*/, false) + backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{2, 3}, /*tag*/ "", /*showStatistics*/ false, + /*showTabular*/ false, /*checkFiles*/ false, /*checkChunks*/ false, /*searchFossils*/ false, /*resurrect*/ false, /*rewiret*/ false, 1, /*allowFailures*/ false) backupManager.Backup(testDir+"/repository1" /*quickMode=*/, false, threads, "fourth", false, false, 0, false, 1024, 1024) backupManager.SnapshotManager.PruneSnapshots("host1", "host1" /*revisions*/, nil /*tags*/, nil /*retentions*/, nil, /*exhaustive*/ false /*exclusive=*/, true /*ignoredIDs*/, nil /*dryRun*/, false /*deleteOnly*/, false /*collectOnly*/, false, 1) @@ -375,8 +376,8 @@ func TestBackupManager(t *testing.T) { if numberOfSnapshots != 3 { t.Errorf("Expected 3 snapshots but got %d", numberOfSnapshots) } - backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{2, 3, 4} /*tag*/, "", - /*showStatistics*/ false /*showTabular*/, false /*checkFiles*/, false /*checkChunks*/, false /*searchFossils*/, false /*resurrect*/, false, 1 /*allowFailures*/, false) + backupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{2, 3, 4}, /*tag*/ "", /*showStatistics*/ false, + /*showTabular*/ false, /*checkFiles*/ false, /*checkChunks*/ false, /*searchFossils*/ false, /*resurrect*/ false, /*rewiret*/ false, 1, /*allowFailures*/ false) /*buf := make([]byte, 1<<16) runtime.Stack(buf, true) @@ -548,13 +549,13 @@ func TestPersistRestore(t *testing.T) { // check snapshots - unencBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{1} /*tag*/, "", - /*showStatistics*/ true /*showTabular*/, false /*checkFiles*/, true /*checkChunks*/, false, - /*searchFossils*/ false /*resurrect*/, false, 1 /*allowFailures*/, false) + unencBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{1}, /*tag*/ "", + /*showStatistics*/ true, /*showTabular*/ false, /*checkFiles*/ true, /*checkChunks*/ false, + /*searchFossils*/ false, /*resurrect*/ false, /*rewiret*/ false, 1, /*allowFailures*/ false) - encBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{1} /*tag*/, "", - /*showStatistics*/ true /*showTabular*/, false /*checkFiles*/, true /*checkChunks*/, false, - /*searchFossils*/ false /*resurrect*/, false, 1 /*allowFailures*/, false) + encBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{1}, /*tag*/ "", + /*showStatistics*/ true, /*showTabular*/ false, /*checkFiles*/ true, /*checkChunks*/ false, + /*searchFossils*/ false, /*resurrect*/ false, /*rewiret*/ false, 1, /*allowFailures*/ false) // check functions checkAllUncorrupted := func(cmpRepository string) { @@ -640,18 +641,28 @@ func TestPersistRestore(t *testing.T) { os.Remove(testDir+"/unenc_storage"+"/chunks"+chunkToCorrupt1) os.Remove(testDir+"/enc_storage"+"/chunks"+chunkToCorrupt2) } - + + // This is to make sure that allowFailures is set to true. Note that this is not needed + // in the production code because chunkOperator can be only recreated multiple time in tests. + if unencBackupManager.SnapshotManager.chunkOperator != nil { + unencBackupManager.SnapshotManager.chunkOperator.allowFailures = true + } + + if encBackupManager.SnapshotManager.chunkOperator != nil { + encBackupManager.SnapshotManager.chunkOperator.allowFailures = true + } + // check snapshots with --persist (allowFailures == true) // this would cause a panic and os.Exit from duplicacy_log if allowFailures == false - unencBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{1} /*tag*/, "", - /*showStatistics*/ true /*showTabular*/, false /*checkFiles*/, true /*checkChunks*/, false, - /*searchFossils*/ false /*resurrect*/, false, 1 /*allowFailures*/, true) + unencBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{1}, /*tag*/ "", + /*showStatistics*/ true, /*showTabular*/ false, /*checkFiles*/ true, /*checkChunks*/ false, + /*searchFossils*/ false, /*resurrect*/ false, /*rewrite*/ false, 1, /*allowFailures*/ true) - encBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1" /*revisions*/, []int{1} /*tag*/, "", - /*showStatistics*/ true /*showTabular*/, false /*checkFiles*/, true /*checkChunks*/, false, - /*searchFossils*/ false /*resurrect*/, false, 1 /*allowFailures*/, true) + encBackupManager.SnapshotManager.CheckSnapshots( /*snapshotID*/ "host1", /*revisions*/ []int{1}, /*tag*/ "", + /*showStatistics*/ true, /*showTabular*/ false, /*checkFiles*/ true, /*checkChunks*/ false, + /*searchFossils*/ false, /*resurrect*/ false, /*rewrite*/ false, 1, /*allowFailures*/ true) - + // test restore corrupted, inPlace = true, corrupted files will have hash failures os.RemoveAll(testDir+"/repository2") SetDuplicacyPreferencePath(testDir + "/repository2/.duplicacy") diff --git a/src/duplicacy_hubicclient_test.go b/src/duplicacy_hubicclient_test.go deleted file mode 100644 index c038f699..00000000 --- a/src/duplicacy_hubicclient_test.go +++ /dev/null @@ -1,149 +0,0 @@ -// Copyright (c) Acrosync LLC. All rights reserved. -// Free for personal use and commercial trial -// Commercial use requires per-user licenses available from https://duplicacy.com - -package duplicacy - -import ( - "crypto/sha256" - "encoding/hex" - "fmt" - "io" - "testing" - - crypto_rand "crypto/rand" - "math/rand" -) - -func TestHubicClient(t *testing.T) { - - hubicClient, err := NewHubicClient("hubic-token.json") - if err != nil { - t.Errorf("Failed to create the Hubic client: %v", err) - return - } - - hubicClient.TestMode = true - - existingFiles, err := hubicClient.ListEntries("") - for _, file := range existingFiles { - fmt.Printf("name: %s, isDir: %t\n", file.Name, file.Type == "application/directory") - } - - testExists, _, _, err := hubicClient.GetFileInfo("test") - if err != nil { - t.Errorf("Failed to list the test directory: %v", err) - return - } - if !testExists { - err = hubicClient.CreateDirectory("test") - if err != nil { - t.Errorf("Failed to create the test directory: %v", err) - return - } - } - - test1Exists, _, _, err := hubicClient.GetFileInfo("test/test1") - if err != nil { - t.Errorf("Failed to list the test1 directory: %v", err) - return - } - if !test1Exists { - err = hubicClient.CreateDirectory("test/test1") - if err != nil { - t.Errorf("Failed to create the test1 directory: %v", err) - return - } - } - - test2Exists, _, _, err := hubicClient.GetFileInfo("test/test2") - if err != nil { - t.Errorf("Failed to list the test2 directory: %v", err) - return - } - if !test2Exists { - err = hubicClient.CreateDirectory("test/test2") - if err != nil { - t.Errorf("Failed to create the test2 directory: %v", err) - return - } - } - - numberOfFiles := 20 - maxFileSize := 64 * 1024 - - for i := 0; i < numberOfFiles; i++ { - content := make([]byte, rand.Int()%maxFileSize+1) - _, err = crypto_rand.Read(content) - if err != nil { - t.Errorf("Error generating random content: %v", err) - return - } - - hasher := sha256.New() - hasher.Write(content) - filename := hex.EncodeToString(hasher.Sum(nil)) - - fmt.Printf("file: %s\n", filename) - - err = hubicClient.UploadFile("test/test1/"+filename, content, 100) - if err != nil { - /*if e, ok := err.(ACDError); !ok || e.Status != 409 */ { - t.Errorf("Failed to upload the file %s: %v", filename, err) - return - } - } - } - - entries, err := hubicClient.ListEntries("test/test1") - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - - exists, isDir, size, err := hubicClient.GetFileInfo("test/test1/" + entry.Name) - fmt.Printf("%s exists: %t, isDir: %t, size: %d, err: %v\n", "test/test1/"+entry.Name, exists, isDir, size, err) - - err = hubicClient.MoveFile("test/test1/"+entry.Name, "test/test2/"+entry.Name) - if err != nil { - t.Errorf("Failed to move %s: %v", entry.Name, err) - return - } - } - - entries, err = hubicClient.ListEntries("test/test2") - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - readCloser, _, err := hubicClient.DownloadFile("test/test2/" + entry.Name) - if err != nil { - t.Errorf("Error downloading file %s: %v", entry.Name, err) - return - } - - hasher := sha256.New() - io.Copy(hasher, readCloser) - hash := hex.EncodeToString(hasher.Sum(nil)) - - if hash != entry.Name { - t.Errorf("File %s, hash %s", entry.Name, hash) - } - - readCloser.Close() - } - - for _, entry := range entries { - - err = hubicClient.DeleteFile("test/test2/" + entry.Name) - if err != nil { - t.Errorf("Failed to delete the file %s: %v", entry.Name, err) - return - } - } - -} diff --git a/src/duplicacy_oneclient_test.go b/src/duplicacy_oneclient_test.go deleted file mode 100644 index b124bfec..00000000 --- a/src/duplicacy_oneclient_test.go +++ /dev/null @@ -1,145 +0,0 @@ -// Copyright (c) Acrosync LLC. All rights reserved. -// Free for personal use and commercial trial -// Commercial use requires per-user licenses available from https://duplicacy.com - -package duplicacy - -import ( - "crypto/sha256" - "encoding/hex" - "fmt" - "io" - "testing" - - crypto_rand "crypto/rand" - "math/rand" -) - -func TestOneDriveClient(t *testing.T) { - - oneDriveClient, err := NewOneDriveClient("one-token.json", false) - if err != nil { - t.Errorf("Failed to create the OneDrive client: %v", err) - return - } - - oneDriveClient.TestMode = true - - existingFiles, err := oneDriveClient.ListEntries("") - for _, file := range existingFiles { - fmt.Printf("name: %s, isDir: %t\n", file.Name, len(file.Folder) != 0) - } - - testID, _, _, err := oneDriveClient.GetFileInfo("test") - if err != nil { - t.Errorf("Failed to list the test directory: %v", err) - return - } - if testID == "" { - err = oneDriveClient.CreateDirectory("", "test") - if err != nil { - t.Errorf("Failed to create the test directory: %v", err) - return - } - } - - test1ID, _, _, err := oneDriveClient.GetFileInfo("test/test1") - if err != nil { - t.Errorf("Failed to list the test1 directory: %v", err) - return - } - if test1ID == "" { - err = oneDriveClient.CreateDirectory("test", "test1") - if err != nil { - t.Errorf("Failed to create the test1 directory: %v", err) - return - } - } - - test2ID, _, _, err := oneDriveClient.GetFileInfo("test/test2") - if err != nil { - t.Errorf("Failed to list the test2 directory: %v", err) - return - } - if test2ID == "" { - err = oneDriveClient.CreateDirectory("test", "test2") - if err != nil { - t.Errorf("Failed to create the test2 directory: %v", err) - return - } - } - - numberOfFiles := 20 - maxFileSize := 64 * 1024 - - for i := 0; i < numberOfFiles; i++ { - content := make([]byte, rand.Int()%maxFileSize+1) - _, err = crypto_rand.Read(content) - if err != nil { - t.Errorf("Error generating random content: %v", err) - return - } - - hasher := sha256.New() - hasher.Write(content) - filename := hex.EncodeToString(hasher.Sum(nil)) - - fmt.Printf("file: %s\n", filename) - - err = oneDriveClient.UploadFile("test/test1/"+filename, content, 100) - if err != nil { - /*if e, ok := err.(ACDError); !ok || e.Status != 409 */ { - t.Errorf("Failed to upload the file %s: %v", filename, err) - return - } - } - } - - entries, err := oneDriveClient.ListEntries("test/test1") - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - err = oneDriveClient.MoveFile("test/test1/"+entry.Name, "test/test2") - if err != nil { - t.Errorf("Failed to move %s: %v", entry.Name, err) - return - } - } - - entries, err = oneDriveClient.ListEntries("test/test2") - if err != nil { - t.Errorf("Error list randomly generated files: %v", err) - return - } - - for _, entry := range entries { - readCloser, _, err := oneDriveClient.DownloadFile("test/test2/" + entry.Name) - if err != nil { - t.Errorf("Error downloading file %s: %v", entry.Name, err) - return - } - - hasher := sha256.New() - io.Copy(hasher, readCloser) - hash := hex.EncodeToString(hasher.Sum(nil)) - - if hash != entry.Name { - t.Errorf("File %s, hash %s", entry.Name, hash) - } - - readCloser.Close() - } - - for _, entry := range entries { - - err = oneDriveClient.DeleteFile("test/test2/" + entry.Name) - if err != nil { - t.Errorf("Failed to delete the file %s: %v", entry.Name, err) - return - } - } - -} diff --git a/src/duplicacy_snapshotmanager_test.go b/src/duplicacy_snapshotmanager_test.go index ef8da492..5cabb2ea 100644 --- a/src/duplicacy_snapshotmanager_test.go +++ b/src/duplicacy_snapshotmanager_test.go @@ -116,7 +116,7 @@ func createTestSnapshotManager(testDir string) *SnapshotManager { func uploadTestChunk(manager *SnapshotManager, content []byte) string { - chunkOperator := CreateChunkOperator(manager.config, manager.storage, nil, false, *testThreads, false) + chunkOperator := CreateChunkOperator(manager.config, manager.storage, nil, false, false, *testThreads, false) chunkOperator.UploadCompletionFunc = func(chunk *Chunk, chunkIndex int, skipped bool, chunkSize int, uploadSize int) { LOG_INFO("UPLOAD_CHUNK", "Chunk %s size %d uploaded", chunk.GetID(), chunkSize) } @@ -179,7 +179,7 @@ func createTestSnapshot(manager *SnapshotManager, snapshotID string, revision in func checkTestSnapshots(manager *SnapshotManager, expectedSnapshots int, expectedFossils int) { - manager.CreateChunkOperator(false, 1, false) + manager.CreateChunkOperator(false, false, 1, false) defer func() { manager.chunkOperator.Stop() manager.chunkOperator = nil @@ -625,7 +625,7 @@ func TestPruneNewSnapshots(t *testing.T) { // Now chunkHash1 wil be resurrected snapshotManager.PruneSnapshots("vm1@host1", "vm1@host1", []int{}, []string{}, []string{}, false, false, []string{}, false, false, false, 1) checkTestSnapshots(snapshotManager, 4, 0) - snapshotManager.CheckSnapshots("vm1@host1", []int{2, 3}, "", false, false, false, false, false, false, 1, false) + snapshotManager.CheckSnapshots("vm1@host1", []int{2, 3}, "", false, false, false, false, false, false, false, 1, false) } // A fossil collection left by an aborted prune should be ignored if any supposedly deleted snapshot exists @@ -674,7 +674,7 @@ func TestPruneGhostSnapshots(t *testing.T) { // Run the prune again but the fossil collection should be igored, since revision 1 still exists snapshotManager.PruneSnapshots("vm1@host1", "vm1@host1", []int{}, []string{}, []string{}, false, false, []string{}, false, false, false, 1) checkTestSnapshots(snapshotManager, 3, 2) - snapshotManager.CheckSnapshots("vm1@host1", []int{1, 2, 3}, "", false, false, false, false, true /*searchFossils*/, false, 1, false) + snapshotManager.CheckSnapshots("vm1@host1", []int{1, 2, 3}, "", false, false, false, false, true /*searchFossils*/, false, false, 1, false) // Prune snapshot 1 again snapshotManager.PruneSnapshots("vm1@host1", "vm1@host1", []int{1}, []string{}, []string{}, false, false, []string{}, false, false, false, 1) @@ -688,5 +688,5 @@ func TestPruneGhostSnapshots(t *testing.T) { // Run the prune again and this time the fossil collection will be processed and the fossils removed snapshotManager.PruneSnapshots("vm1@host1", "vm1@host1", []int{}, []string{}, []string{}, false, false, []string{}, false, false, false, 1) checkTestSnapshots(snapshotManager, 3, 0) - snapshotManager.CheckSnapshots("vm1@host1", []int{2, 3, 4}, "", false, false, false, false, false, false, 1, false) + snapshotManager.CheckSnapshots("vm1@host1", []int{2, 3, 4}, "", false, false, false, false, false, false, false, 1, false) }