Ensure close in content test

crosbymichael · crosbymichael · commit 4f6ba8286d75 · 2019-06-04T19:26:34.000Z
Signed-off-by: Michael Crosby &lt;crosbymichael@gmail.com&gt;
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
@@ -338,7 +338,7 @@ func checkRefNotAvailable(ctx context.Context, t *testing.T, cs content.Store, r
 
 	w, err := cs.Writer(ctx, content.WithRef(ref))
 	if err == nil {
-		w.Close()
+		defer w.Close()
 		t.Fatal("writer created with ref, expected to be in use")
 	}
 	if !errdefs.IsUnavailable(err) {
@@ -402,6 +402,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)
 		}
 		t.Fatalf("Unexpected error: %+v", err)
 	}
+	w.Close()
 
 	w, err = cs.Writer(ctx, content.WithRef(ref))
 	if err != nil {
@@ -425,6 +426,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)
 		t.Errorf("Unexpected error: %+v", err)
 	}
 
+	w.Close()
 	w, err = cs.Writer(ctx, content.WithRef(ref))
 	if err != nil {
 		t.Fatal(err)
@@ -440,6 +442,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)
 		t.Errorf("Unexpected error: %+v", err)
 	}
 
+	w.Close()
 	w, err = cs.Writer(ctx, content.WithRef(ref))
 	if err != nil {
 		t.Fatal(err)
@@ -455,6 +458,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)
 		t.Fatalf("Failed to commit: %+v", err)
 	}
 
+	w.Close()
 	// Create another writer with same reference
 	w, err = cs.Writer(ctx, content.WithRef(ref))
 	if err != nil {
@@ -481,6 +485,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)
 		t.Fatalf("Unexpected error: %+v", err)
 	}
 
+	w.Close()
 	w, err = cs.Writer(ctx, content.WithRef(ref))
 	if err != nil {
 		t.Fatal(err)

Original file line number	Diff line number	Diff line change
`@@ -338,7 +338,7 @@ func checkRefNotAvailable(ctx context.Context, t *testing.T, cs content.Store, r`
`338`	`338`
`339`	`339`	`w, err := cs.Writer(ctx, content.WithRef(ref))`
`340`	`340`	`if err == nil {`
`341`		`- w.Close()`
	`341`	`+ defer w.Close()`
`342`	`342`	`t.Fatal("writer created with ref, expected to be in use")`
`343`	`343`	`}`
`344`	`344`	`if !errdefs.IsUnavailable(err) {`
`@@ -402,6 +402,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)`
`402`	`402`	`}`
`403`	`403`	`t.Fatalf("Unexpected error: %+v", err)`
`404`	`404`	`}`
	`405`	`+ w.Close()`
`405`	`406`
`406`	`407`	`w, err = cs.Writer(ctx, content.WithRef(ref))`
`407`	`408`	`if err != nil {`
`@@ -425,6 +426,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)`
`425`	`426`	`t.Errorf("Unexpected error: %+v", err)`
`426`	`427`	`}`
`427`	`428`
	`429`	`+ w.Close()`
`428`	`430`	`w, err = cs.Writer(ctx, content.WithRef(ref))`
`429`	`431`	`if err != nil {`
`430`	`432`	`t.Fatal(err)`
`@@ -440,6 +442,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)`
`440`	`442`	`t.Errorf("Unexpected error: %+v", err)`
`441`	`443`	`}`
`442`	`444`
	`445`	`+ w.Close()`
`443`	`446`	`w, err = cs.Writer(ctx, content.WithRef(ref))`
`444`	`447`	`if err != nil {`
`445`	`448`	`t.Fatal(err)`
`@@ -455,6 +458,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)`
`455`	`458`	`t.Fatalf("Failed to commit: %+v", err)`
`456`	`459`	`}`
`457`	`460`
	`461`	`+ w.Close()`
`458`	`462`	`// Create another writer with same reference`
`459`	`463`	`w, err = cs.Writer(ctx, content.WithRef(ref))`
`460`	`464`	`if err != nil {`
`@@ -481,6 +485,7 @@ func checkCommitErrorState(ctx context.Context, t *testing.T, cs content.Store)`
`481`	`485`	`t.Fatalf("Unexpected error: %+v", err)`
`482`	`486`	`}`
`483`	`487`
	`488`	`+ w.Close()`
`484`	`489`	`w, err = cs.Writer(ctx, content.WithRef(ref))`
`485`	`490`	`if err != nil {`
`486`	`491`	`t.Fatal(err)`