From 25b5592eafcaa03c157abbd121c18219e40404ce Mon Sep 17 00:00:00 2001 From: Derek McGowan Date: Thu, 30 Nov 2017 14:39:24 -0800 Subject: [PATCH] Fix close twice test to retain snapshot Update to set labels and use a unique key Signed-off-by: Derek McGowan --- snapshots/testsuite/testsuite.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/snapshots/testsuite/testsuite.go b/snapshots/testsuite/testsuite.go index e24177ed1..ac80827f1 100644 --- a/snapshots/testsuite/testsuite.go +++ b/snapshots/testsuite/testsuite.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io/ioutil" + "math/rand" "os" "path/filepath" "testing" @@ -807,14 +808,17 @@ func checkFileFromLowerLayer(ctx context.Context, t *testing.T, snapshotter snap } func closeTwice(ctx context.Context, t *testing.T, snapshotter snapshots.Snapshotter, work string) { + n := fmt.Sprintf("closeTwice-%d", rand.Int()) + prepare := fmt.Sprintf("%s-prepare", n) + // do some dummy ops to modify the snapshotter internal state - if _, err := snapshotter.Prepare(ctx, "dummy", ""); err != nil { + if _, err := snapshotter.Prepare(ctx, prepare, "", opt); err != nil { t.Fatal(err) } - if err := snapshotter.Commit(ctx, "dummy-1", "dummy"); err != nil { + if err := snapshotter.Commit(ctx, n, prepare, opt); err != nil { t.Fatal(err) } - if err := snapshotter.Remove(ctx, "dummy-1"); err != nil { + if err := snapshotter.Remove(ctx, n); err != nil { t.Fatal(err) } if err := snapshotter.Close(); err != nil {