Skip to content

Commit 4844ea1

Browse files
darstahldarstahl
committed
More cleanup
Signed-off-by: Darren Stahl <[email protected]>
1 parent 845b2b3 commit 4844ea1

3 files changed

Lines changed: 13 additions & 11 deletions

File tree

‎snapshots/testsuite/testsuite.go‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -589,9 +589,18 @@ func checkRemoveIntermediateSnapshot(ctx context.Context, t *testing.T, snapshot
589589
}
590590

591591
// Removal from toplayer to base should not fail.
592-
defer testutil.RemoveSnapshot(ctx, t, snapshotter, committedBase)
593-
defer testutil.RemoveSnapshot(ctx, t, snapshotter, committedInter)
594-
defer testutil.RemoveSnapshot(ctx, t, snapshotter, topLayer)
592+
err = snapshotter.Remove(ctx, topLayer)
593+
if err != nil {
594+
t.Fatal(err)
595+
}
596+
err = snapshotter.Remove(ctx, committedInter)
597+
if err != nil {
598+
t.Fatal(err)
599+
}
600+
err = snapshotter.Remove(ctx, committedBase)
601+
if err != nil {
602+
t.Fatal(err)
603+
}
595604
}
596605

597606
// baseTestSnapshots creates a base set of snapshots for tests, each snapshot is empty

‎vendor/github.com/containerd/continuity/context.go‎

Lines changed: 0 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/github.com/containerd/continuity/sysx/file_posix.go‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)