fix golint and unit test

Author: lminzhw

pkg/controllers/job/helpers/helpers.go

@@ -49,6 +49,7 @@ func MakePodName(jobName string, taskName string, index int) string {
 	return fmt.Sprintf(PodNameFmt, jobName, taskName, index)
 }
 
+// GenRandomStr generate random str with specified length l
 func GenRandomStr(l int) string {
 	str := "0123456789abcdefghijklmnopqrstuvwxyz"
 	bytes := []byte(str)

pkg/controllers/job/job_controller_actions.go

@@ -339,6 +339,9 @@ func (cc *Controller) createJobIOIfNotExist(job *vkv1.Job) (*vkv1.Job, error) {
 	// If PVC does not exist, create them for Job.
 	var needUpdate bool
 	volumes := job.Spec.Volumes
+	if job.Status.ControlledResources == nil {
+		job.Status.ControlledResources = make(map[string]string)
+	}
 	for index, volume := range volumes {
 		vcName := volume.VolumeClaimName
 		if len(vcName) == 0 {
@@ -375,7 +378,7 @@ func (cc *Controller) createJobIOIfNotExist(job *vkv1.Job) (*vkv1.Job, error) {
 			if exist {
 				job.Status.ControlledResources["volume-pvc-"+vcName] = vcName
 			} else {
-				msg := fmt.Sprintf("PVC %s is not found, the job will be in the Pending state until the PVC is created.", vcName)
+				msg := fmt.Sprintf("pvc %s is not found, the job will be in the Pending state until the PVC is created", vcName)
 				glog.Error(msg)
 				return job, errors.New(msg)
 			}
@@ -387,12 +390,9 @@ func (cc *Controller) createJobIOIfNotExist(job *vkv1.Job) (*vkv1.Job, error) {
 			glog.Errorf("Failed to update Job %v/%v for volume claim name: %v ",
 				job.Namespace, job.Name, err)
 			return job, err
-		} else {
-			newJob.Status = job.Status
-			return newJob, err
 		}
-		newJob.Status = job.Status
 
+		newJob.Status = job.Status
 		return newJob, err
 	}
 	return job, nil

pkg/controllers/job/job_controller_actions_test.go

@@ -17,6 +17,7 @@ limitations under the License.
 package job
 
 import (
+	"errors"
 	"fmt"
 	"testing"
 
@@ -295,7 +296,7 @@ func TestCreateJobIOIfNotExistFunc(t *testing.T) {
 		ExpextVal error
 	}{
 		{
-			Name: "Create Job IO success case",
+			Name: "Create Job IO case",
 			Job: &v1alpha1.Job{
 				ObjectMeta: metav1.ObjectMeta{
 					Name:      "job1",
@@ -309,7 +310,7 @@ func TestCreateJobIOIfNotExistFunc(t *testing.T) {
 					},
 				},
 			},
-			ExpextVal: nil,
+			ExpextVal: errors.New("pvc pvc1 is not found, the job will be in the Pending state until the PVC is created"),
 		},
 	}
 
@@ -319,8 +320,14 @@ func TestCreateJobIOIfNotExistFunc(t *testing.T) {
 			fakeController := newFakeController()
 
 			job, err := fakeController.createJobIOIfNotExist(testcase.Job)
-			if err != testcase.ExpextVal {
-				t.Errorf("Expected Return value to be : %s, but got: %s in testcase %d", testcase.ExpextVal, err, i)
+			if testcase.ExpextVal == nil {
+				if err != nil {
+					t.Errorf("Expected Return value to be : %v, but got: %v in testcase %d", testcase.ExpextVal, err, i)
+				}
+			} else {
+				if err == nil || err.Error() != testcase.ExpextVal.Error() {
+					t.Errorf("Expected Return value to be : %v, but got: %v in testcase %d", testcase.ExpextVal.Error(), err.Error(), i)
+				}
 			}
 
 			if len(job.Spec.Volumes) == 0 {

test/e2e/job_controlled_resource.go

@@ -125,6 +125,17 @@ var _ = Describe("Job E2E Test: Test Job PVCs", func() {
 
 		_, err1 := context.kubeclient.CoreV1().PersistentVolumeClaims(namespace).Create(&pvc)
 		Expect(err1).NotTo(HaveOccurred(), "pvc creation")
+
+		pvSpec := &v12.PersistentVolumeClaimSpec{
+			Resources: v12.ResourceRequirements{
+				Requests: v12.ResourceList{
+					v12.ResourceName(v12.ResourceStorage): resource.MustParse("1Gi"),
+				},
+			},
+			AccessModes: []v12.PersistentVolumeAccessMode{
+				v12.ReadWriteOnce,
+			},
+		}
 		job := createJob(context, &jobSpec{
 			namespace: namespace,
 			name:      jobName,
@@ -139,9 +150,12 @@ var _ = Describe("Job E2E Test: Test Job PVCs", func() {
 			},
 			volumes: []v1alpha1.VolumeSpec{
 				{
-					MountPath:       "/mounttwo",
+					MountPath:       "/mountone",
 					VolumeClaimName: pvcName,
-					VolumeClaim:     &pvc.Spec,
+				},
+				{
+					MountPath:   "/mounttwo",
+					VolumeClaim: pvSpec,
 				},
 			},
 		})
@@ -152,12 +166,12 @@ var _ = Describe("Job E2E Test: Test Job PVCs", func() {
 		job, err = context.vcclient.BatchV1alpha1().Jobs(namespace).Get(jobName, metav1.GetOptions{})
 		Expect(err).NotTo(HaveOccurred())
 
-		Expect(len(job.Spec.Volumes)).To(Equal(1),
+		Expect(len(job.Spec.Volumes)).To(Equal(2),
 			" volume should be created")
-		for _, volume := range job.Spec.Volumes {
-			Expect(volume.VolumeClaimName).Should((Equal(pvcName)),
-				"PVC name should not be generated .")
-		}
+		Expect(job.Spec.Volumes[0].VolumeClaimName).Should(Equal(pvcName),
+			"volume 1 PVC name should not be generated .")
+		Expect(job.Spec.Volumes[1].VolumeClaimName).Should(Not(Equal("")),
+			"volume 0 PVC name should be generated.")
 	})
 
 	It("Generate PodGroup and valid minResource when creating job", func() {