From 3a5fcdce99fdea25709569a2d15867c09051219e Mon Sep 17 00:00:00 2001 From: ashmrtn <3891298+ashmrtn@users.noreply.github.com> Date: Wed, 23 Aug 2023 10:58:24 -0700 Subject: [PATCH] Reenable point-in-time longevity test (#4090) Now that kopia won't try to mutate state in read-only mode it's safe to reenable the test ensuring backups that were deleted are still available when opening the repo at a specific point in time This reverts commit 8d3fdeeb8dbd8dc68284c1d33b0b431d309b4f5b. --- #### Does this PR need a docs update or release note? - [ ] :white_check_mark: Yes, it's included - [ ] :clock1: Yes, but in a later PR - [x] :no_entry: No #### Type of change - [ ] :sunflower: Feature - [ ] :bug: Bugfix - [ ] :world_map: Documentation - [x] :robot: Supportability/Tests - [x] :computer: CI/Deployment - [ ] :broom: Tech Debt/Cleanup #### Issue(s) * closes #4031 merge after: * #4089 #### Test Plan - [x] :muscle: Manual - [ ] :zap: Unit test - [ ] :green_heart: E2E --- src/cmd/longevity_test/longevity.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cmd/longevity_test/longevity.go b/src/cmd/longevity_test/longevity.go index efe3bd352..b3d6f865d 100644 --- a/src/cmd/longevity_test/longevity.go +++ b/src/cmd/longevity_test/longevity.go @@ -67,9 +67,6 @@ func deleteBackups( // pitrListBackups connects to the repository at the given point in time and // lists the backups for service. It then checks the list of backups contains // the backups in backupIDs. -// -//nolint:unused -//lint:ignore U1000 Waiting for upstream fix tracked by 4031 func pitrListBackups( ctx context.Context, service path.ServiceType, @@ -159,10 +156,16 @@ func main() { fatal(ctx, "invalid number of days provided", nil) } - _, err = deleteBackups(ctx, service, days) + beforeDel := time.Now() + + backups, err := deleteBackups(ctx, service, days) if err != nil { fatal(ctx, "deleting backups", clues.Stack(err)) } + + if err := pitrListBackups(ctx, service, beforeDel, backups); err != nil { + fatal(ctx, "listing backups from point in time", clues.Stack(err)) + } } func fatal(ctx context.Context, msg string, err error) {