Add unit test.

Signed-off-by: Lantao Liu <[email protected]>

Author: Random-Liu

hack/verify-lint.sh

@@ -23,6 +23,7 @@ for d in $(find . -type d -a \( -iwholename './pkg*' -o -iwholename './cmd*' \))
 		 --exclude='error return value not checked.*(Close|Log|Print).*\(errcheck\)$' \
 		 --exclude='.*_test\.go:.*error return value not checked.*\(errcheck\)$' \
 		 --exclude='duplicate of.*_test.go.*\(dupl\)$' \
+		 --exclude='.*/mock_.*\.go:.*\(golint\)$' \
 		 --disable=aligncheck \
 		 --disable=gotype \
 		 --disable=gas \

pkg/server/status_test.go

@@ -0,0 +1,79 @@
+/*
+Copyright 2017 The Kubernetes 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 server
+
+import (
+	"errors"
+	"testing"
+
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	"golang.org/x/net/context"
+	healthapi "google.golang.org/grpc/health/grpc_health_v1"
+	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
+
+	servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"
+)
+
+func TestStatus(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+	for desc, test := range map[string]struct {
+		checkRes                 *healthapi.HealthCheckResponse
+		checkErr                 error
+		expectedRuntimeReadiness bool
+	}{
+		"runtime should not be ready when containerd is not serving": {
+			checkRes: &healthapi.HealthCheckResponse{
+				Status: healthapi.HealthCheckResponse_NOT_SERVING,
+			},
+			expectedRuntimeReadiness: false,
+		},
+		"runtime should not be ready when containerd healthcheck returns error": {
+			checkErr:                 errors.New("healthcheck error"),
+			expectedRuntimeReadiness: false,
+		},
+		"runtime should be ready when containerd is serving": {
+			checkRes: &healthapi.HealthCheckResponse{
+				Status: healthapi.HealthCheckResponse_SERVING,
+			},
+			expectedRuntimeReadiness: true,
+		},
+	} {
+		t.Logf("TestCase %q", desc)
+		c := newTestCRIContainerdService()
+		ctx := context.Background()
+		mock := servertesting.NewMockHealthClient(ctrl)
+		mock.EXPECT().Check(ctx, &healthapi.HealthCheckRequest{}).Return(test.checkRes, test.checkErr)
+
+		c.healthService = mock
+		resp, err := c.Status(ctx, &runtime.StatusRequest{})
+		assert.NoError(t, err)
+		require.NotNil(t, resp)
+		runtimeReady := resp.Status.Conditions[0]
+		networkReady := resp.Status.Conditions[1]
+		assert.Equal(t, runtime.RuntimeReady, runtimeReady.Type)
+		assert.Equal(t, test.expectedRuntimeReadiness, runtimeReady.Status)
+		if !test.expectedRuntimeReadiness {
+			assert.Equal(t, runtimeNotReadyReason, runtimeReady.Reason)
+			assert.NotEmpty(t, runtimeReady.Message)
+		}
+		assert.Equal(t, runtime.NetworkReady, networkReady.Type)
+		assert.True(t, networkReady.Status)
+	}
+}

pkg/server/testing/mock_health_client.go

@@ -0,0 +1,64 @@
+/*
+Copyright 2017 The Kubernetes 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.
+*/
+
+// Automatically generated by MockGen. DO NOT EDIT!
+// Source: google.golang.org/grpc/health/grpc_health_v1 (interfaces: HealthClient)
+
+package testing
+
+import (
+	gomock "github.com/golang/mock/gomock"
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+	grpc_health_v1 "google.golang.org/grpc/health/grpc_health_v1"
+)
+
+// Mock of HealthClient interface
+type MockHealthClient struct {
+	ctrl     *gomock.Controller
+	recorder *_MockHealthClientRecorder
+}
+
+// Recorder for MockHealthClient (not exported)
+type _MockHealthClientRecorder struct {
+	mock *MockHealthClient
+}
+
+func NewMockHealthClient(ctrl *gomock.Controller) *MockHealthClient {
+	mock := &MockHealthClient{ctrl: ctrl}
+	mock.recorder = &_MockHealthClientRecorder{mock}
+	return mock
+}
+
+func (_m *MockHealthClient) EXPECT() *_MockHealthClientRecorder {
+	return _m.recorder
+}
+
+func (_m *MockHealthClient) Check(_param0 context.Context, _param1 *grpc_health_v1.HealthCheckRequest, _param2 ...grpc.CallOption) (*grpc_health_v1.HealthCheckResponse, error) {
+	_s := []interface{}{_param0, _param1}
+	for _, _x := range _param2 {
+		_s = append(_s, _x)
+	}
+	ret := _m.ctrl.Call(_m, "Check", _s...)
+	ret0, _ := ret[0].(*grpc_health_v1.HealthCheckResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+func (_mr *_MockHealthClientRecorder) Check(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	_s := append([]interface{}{arg0, arg1}, arg2...)
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Check", _s...)
+}

pkg/server/testing/mock_version_client.go

@@ -0,0 +1,65 @@
+/*
+Copyright 2017 The Kubernetes 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.
+*/
+
+// Automatically generated by MockGen. DO NOT EDIT!
+// Source: github.com/containerd/containerd/api/services/version (interfaces: VersionClient)
+
+package testing
+
+import (
+	version "github.com/containerd/containerd/api/services/version"
+	gomock "github.com/golang/mock/gomock"
+	empty "github.com/golang/protobuf/ptypes/empty"
+	context "golang.org/x/net/context"
+	grpc "google.golang.org/grpc"
+)
+
+// Mock of VersionClient interface
+type MockVersionClient struct {
+	ctrl     *gomock.Controller
+	recorder *_MockVersionClientRecorder
+}
+
+// Recorder for MockVersionClient (not exported)
+type _MockVersionClientRecorder struct {
+	mock *MockVersionClient
+}
+
+func NewMockVersionClient(ctrl *gomock.Controller) *MockVersionClient {
+	mock := &MockVersionClient{ctrl: ctrl}
+	mock.recorder = &_MockVersionClientRecorder{mock}
+	return mock
+}
+
+func (_m *MockVersionClient) EXPECT() *_MockVersionClientRecorder {
+	return _m.recorder
+}
+
+func (_m *MockVersionClient) Version(_param0 context.Context, _param1 *empty.Empty, _param2 ...grpc.CallOption) (*version.VersionResponse, error) {
+	_s := []interface{}{_param0, _param1}
+	for _, _x := range _param2 {
+		_s = append(_s, _x)
+	}
+	ret := _m.ctrl.Call(_m, "Version", _s...)
+	ret0, _ := ret[0].(*version.VersionResponse)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+func (_mr *_MockVersionClientRecorder) Version(arg0, arg1 interface{}, arg2 ...interface{}) *gomock.Call {
+	_s := append([]interface{}{arg0, arg1}, arg2...)
+	return _mr.mock.ctrl.RecordCall(_mr.mock, "Version", _s...)
+}

pkg/server/version_test.go

@@ -0,0 +1,61 @@
+/*
+Copyright 2017 The Kubernetes 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 server
+
+import (
+	"errors"
+	"testing"
+
+	versionapi "github.com/containerd/containerd/api/services/version"
+	"github.com/golang/mock/gomock"
+	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/stretchr/testify/assert"
+	"golang.org/x/net/context"
+	runtime "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1"
+
+	servertesting "github.com/kubernetes-incubator/cri-containerd/pkg/server/testing"
+)
+
+func TestVersion(t *testing.T) {
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+	// TODO(random-liu): Check containerd version after containerd fixes its version.
+	for desc, test := range map[string]struct {
+		versionRes *versionapi.VersionResponse
+		versionErr error
+		expectErr  bool
+	}{
+		"should return error if containerd version returns error": {
+			versionErr: errors.New("random error"),
+			expectErr:  true,
+		},
+		"should not return error if containerd version returns successfully": {
+			versionRes: &versionapi.VersionResponse{Version: "1.1.1"},
+			expectErr:  false,
+		},
+	} {
+		t.Logf("TestCase %q", desc)
+		c := newTestCRIContainerdService()
+		ctx := context.Background()
+		mock := servertesting.NewMockVersionClient(ctrl)
+		mock.EXPECT().Version(ctx, &empty.Empty{}).Return(test.versionRes, test.versionErr)
+
+		c.versionService = mock
+		_, err := c.Version(ctx, &runtime.VersionRequest{})
+		assert.Equal(t, test.expectErr, err != nil)
+	}
+}