From a76f230984b7d6d351325291042402da6c793f67 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Fri, 23 Mar 2018 13:56:45 -0700
Subject: [PATCH] content/testsuite: include small blob test in standard suite

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 content/testsuite/provideringester.go | 76 ---------------------------
 content/testsuite/testsuite.go        | 45 ++++++++++++++--
 2 files changed, 41 insertions(+), 80 deletions(-)
 delete mode 100644 content/testsuite/provideringester.go

diff --git a/content/testsuite/provideringester.go b/content/testsuite/provideringester.go
deleted file mode 100644
index 713cb066d..000000000
--- a/content/testsuite/provideringester.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-   Copyright The containerd Authors.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-package testsuite
-
-import (
-	"context"
-	"io"
-	"io/ioutil"
-	"testing"
-
-	"github.com/containerd/containerd/content"
-	digest "github.com/opencontainers/go-digest"
-)
-
-// ProviderIngester consists of provider and ingester.
-// This interface is used for test cases that does not require
-// complete content.Store implementation.
-type ProviderIngester interface {
-	content.Provider
-	content.Ingester
-}
-
-// TestSmallBlob tests reading a blob which is smaller than the read size.
-// This test is exposed so that it can be used for incomplete content.Store implementation.
-func TestSmallBlob(ctx context.Context, t *testing.T, store ProviderIngester) {
-	blob := []byte(`foobar`)
-	blobSize := int64(len(blob))
-	blobDigest := digest.FromBytes(blob)
-	// test write
-	w, err := store.Writer(ctx, t.Name(), blobSize, blobDigest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := w.Write(blob); err != nil {
-		t.Fatal(err)
-	}
-	if err := w.Commit(ctx, blobSize, blobDigest); err != nil {
-		t.Fatal(err)
-	}
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-	// test read.
-	readSize := blobSize + 1
-	ra, err := store.ReaderAt(ctx, blobDigest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	r := io.NewSectionReader(ra, 0, readSize)
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := ra.Close(); err != nil {
-		t.Fatal(err)
-	}
-	d := digest.FromBytes(b)
-	if blobDigest != d {
-		t.Fatalf("expected %s (%q), got %s (%q)", blobDigest, string(blob),
-			d, string(b))
-	}
-}
diff --git a/content/testsuite/testsuite.go b/content/testsuite/testsuite.go
index 21247fa37..2cba07f52 100644
--- a/content/testsuite/testsuite.go
+++ b/content/testsuite/testsuite.go
@@ -46,14 +46,11 @@ func ContentSuite(t *testing.T, name string, storeFn func(ctx context.Context, r
 	t.Run("ResumeCopy", makeTest(t, name, storeFn, checkResume(resumeCopy)))
 	t.Run("ResumeCopySeeker", makeTest(t, name, storeFn, checkResume(resumeCopySeeker)))
 	t.Run("ResumeCopyReaderAt", makeTest(t, name, storeFn, checkResume(resumeCopyReaderAt)))
+	t.Run("SmallBlob", makeTest(t, name, storeFn, checkSmallBlob))
 	t.Run("Labels", makeTest(t, name, storeFn, checkLabels))
 
 	t.Run("CrossNamespaceAppend", makeTest(t, name, storeFn, checkCrossNSAppend))
 	t.Run("CrossNamespaceShare", makeTest(t, name, storeFn, checkCrossNSShare))
-
-	t.Run("SmallBlob", makeTest(t, name, storeFn, func(ctx context.Context, t *testing.T, cs content.Store) {
-		TestSmallBlob(ctx, t, cs)
-	}))
 }
 
 // ContextWrapper is used to decorate new context used inside the test
@@ -527,6 +524,46 @@ func resumeCopyReaderAt(ctx context.Context, w content.Writer, b []byte, _, size
 	return errors.Wrap(content.Copy(ctx, w, r, size, dgst), "copy failed")
 }
 
+// checkSmallBlob tests reading a blob which is smaller than the read size.
+func checkSmallBlob(ctx context.Context, t *testing.T, store content.Store) {
+	blob := []byte(`foobar`)
+	blobSize := int64(len(blob))
+	blobDigest := digest.FromBytes(blob)
+	// test write
+	w, err := store.Writer(ctx, t.Name(), blobSize, blobDigest)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if _, err := w.Write(blob); err != nil {
+		t.Fatal(err)
+	}
+	if err := w.Commit(ctx, blobSize, blobDigest); err != nil {
+		t.Fatal(err)
+	}
+	if err := w.Close(); err != nil {
+		t.Fatal(err)
+	}
+	// test read.
+	readSize := blobSize + 1
+	ra, err := store.ReaderAt(ctx, blobDigest)
+	if err != nil {
+		t.Fatal(err)
+	}
+	r := io.NewSectionReader(ra, 0, readSize)
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := ra.Close(); err != nil {
+		t.Fatal(err)
+	}
+	d := digest.FromBytes(b)
+	if blobDigest != d {
+		t.Fatalf("expected %s (%q), got %s (%q)", blobDigest, string(blob),
+			d, string(b))
+	}
+}
+
 func checkCrossNSShare(ctx context.Context, t *testing.T, cs content.Store) {
 	wrap, ok := ctx.Value(wrapperKey{}).(ContextWrapper)
 	if !ok {