int-test(backup): update skipped in test hooks from different place

karol-kokoszka · karol-kokoszka · commit 932a84b6592b · 2024-08-10T00:49:37.000+02:00
diff --git a/pkg/service/backup/service_deduplicate_integration_test.go b/pkg/service/backup/service_deduplicate_integration_test.go
@@ -61,6 +61,7 @@ func TestBackupPauseResumeOnDeduplicationStage(t *testing.T) {
 		var deduplicatedOnFreshBackup int64
 		after := func(skipped, uploaded, size int64) {
 			deduplicatedOnFreshBackup += skipped
+			originalTotalSize += size
 		}
 		defer h.service.RemoveDeduplicateTestHooks()
 		h.service.SetDeduplicateTestHooks(func() {}, after)
diff --git a/pkg/service/backup/worker_deduplicate.go b/pkg/service/backup/worker_deduplicate.go
@@ -47,7 +47,7 @@ func (w *worker) deduplicateHost(ctx context.Context, h hostInfo) error {
 		defer func(sd []snapshotDir) {
 			var skipped, uploaded, size int64
 			for _, v := range sd {
-				skipped += v.Progress.Skipped
+				skipped += v.SkippedBytesOffset
 				uploaded += v.Progress.Uploaded
 				size += v.Progress.Size
 			}

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,7 @@ func TestBackupPauseResumeOnDeduplicationStage(t *testing.T) {`
`61`	`61`	`var deduplicatedOnFreshBackup int64`
`62`	`62`	`after := func(skipped, uploaded, size int64) {`
`63`	`63`	`deduplicatedOnFreshBackup += skipped`
	`64`	`+ originalTotalSize += size`
`64`	`65`	`}`
`65`	`66`	`defer h.service.RemoveDeduplicateTestHooks()`
`66`	`67`	`h.service.SetDeduplicateTestHooks(func() {}, after)`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ func (w *worker) deduplicateHost(ctx context.Context, h hostInfo) error {`
`47`	`47`	`defer func(sd []snapshotDir) {`
`48`	`48`	`var skipped, uploaded, size int64`
`49`	`49`	`for _, v := range sd {`
`50`		`- skipped += v.Progress.Skipped`
	`50`	`+ skipped += v.SkippedBytesOffset`
`51`	`51`	`uploaded += v.Progress.Uploaded`
`52`	`52`	`size += v.Progress.Size`
`53`	`53`	`}`