Finish snapshot support.

Signed-off-by: Lantao Liu <lantaol@google.com>

pkg/server/container_remove_test.go

@@ -21,6 +21,8 @@ import (
 	"testing"
 	"time"
 
+	snapshotapi "github.com/containerd/containerd/api/services/snapshot"
+	"github.com/containerd/containerd/api/types/mount"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"golang.org/x/net/context"
@@ -28,6 +30,7 @@ import (
 
 	"github.com/kubernetes-incubator/cri-containerd/pkg/metadata"
 	ostesting "github.com/kubernetes-incubator/cri-containerd/pkg/os/testing"
+	servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"
 )
 
 // TestSetContainerRemoving tests setContainerRemoving sets removing
@@ -87,8 +90,16 @@ func TestSetContainerRemoving(t *testing.T) {
 func TestRemoveContainer(t *testing.T) {
 	testID := "test-id"
 	testName := "test-name"
+	testContainerMetadata := &metadata.ContainerMetadata{
+		ID:         testID,
+		CreatedAt:  time.Now().UnixNano(),
+		StartedAt:  time.Now().UnixNano(),
+		FinishedAt: time.Now().UnixNano(),
+	}
+
 	for desc, test := range map[string]struct {
 		metadata            *metadata.ContainerMetadata
+		removeSnapshotErr   error
 		removeDirErr        error
 		expectErr           bool
 		expectUnsetRemoving bool
@@ -112,32 +123,34 @@ func TestRemoveContainer(t *testing.T) {
 			expectErr: true,
 		},
 		"should not return error if container does not exist": {
-			metadata:  nil,
-			expectErr: false,
+			metadata:          nil,
+			removeSnapshotErr: servertesting.SnapshotNotExistError,
+			expectErr:         false,
+		},
+		"should not return error if snapshot does not exist": {
+			metadata:          testContainerMetadata,
+			removeSnapshotErr: servertesting.SnapshotNotExistError,
+			expectErr:         false,
+		},
+		"should return error if remove snapshot fails": {
+			metadata:          testContainerMetadata,
+			removeSnapshotErr: errors.New("random error"),
+			expectErr:         true,
 		},
 		"should return error if remove container root fails": {
-			metadata: &metadata.ContainerMetadata{
-				ID:         testID,
-				CreatedAt:  time.Now().UnixNano(),
-				StartedAt:  time.Now().UnixNano(),
-				FinishedAt: time.Now().UnixNano(),
-			},
+			metadata:            testContainerMetadata,
 			removeDirErr:        errors.New("random error"),
 			expectErr:           true,
 			expectUnsetRemoving: true,
 		},
 		"should be able to remove container successfully": {
-			metadata: &metadata.ContainerMetadata{
-				ID:         testID,
-				CreatedAt:  time.Now().UnixNano(),
-				StartedAt:  time.Now().UnixNano(),
-				FinishedAt: time.Now().UnixNano(),
-			},
+			metadata:  testContainerMetadata,
 			expectErr: false,
 		},
 	} {
 		t.Logf("TestCase %q", desc)
 		c := newTestCRIContainerdService()
+		fakeSnapshotClient := WithFakeSnapshotClient(c)
 		fakeOS := c.os.(*ostesting.FakeOS)
 		if test.metadata != nil {
 			assert.NoError(t, c.containerNameIndex.Reserve(testName, testID))
@@ -147,6 +160,17 @@ func TestRemoveContainer(t *testing.T) {
 			assert.Equal(t, getContainerRootDir(c.rootDir, testID), path)
 			return test.removeDirErr
 		}
+		if test.removeSnapshotErr == nil {
+			fakeSnapshotClient.SetFakeMounts(testID, []*mount.Mount{
+				{
+					Type:   "bind",
+					Source: "/test/source",
+					Target: "/test/target",
+				},
+			})
+		} else {
+			fakeSnapshotClient.InjectError("remove", test.removeSnapshotErr)
+		}
 		resp, err := c.RemoveContainer(context.Background(), &runtime.RemoveContainerRequest{
 			ContainerId: testID,
 		})
@@ -171,5 +195,8 @@ func TestRemoveContainer(t *testing.T) {
 		assert.Nil(t, meta, "container metadata should be removed")
 		assert.NoError(t, c.containerNameIndex.Reserve(testName, testID),
 			"container name should be released")
+		mountsResp, err := fakeSnapshotClient.Mounts(context.Background(), &snapshotapi.MountsRequest{Key: testID})
+		assert.Equal(t, servertesting.SnapshotNotExistError, err, "snapshot should be removed")
+		assert.Nil(t, mountsResp)
 	}
 }