From 26c07aef02ff535a1be7e9e8a413600bedfe48d4 Mon Sep 17 00:00:00 2001
From: Rakshith R <rar@redhat.com>
Date: Thu, 18 Mar 2021 15:31:16 +0530
Subject: [PATCH] e2e: small fixes in var name and error msg

rookTolBoxPodLabel to rookToolBoxPodLabel
podPot to podOpt
fix error message for getting PV

Signed-off-by: Rakshith R <rar@redhat.com>
---
 e2e/pod.go   | 14 +++++++-------
 e2e/pvc.go   |  2 +-
 e2e/utils.go |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/e2e/pod.go b/e2e/pod.go
index 8ed71f56f..2687e98b2 100644
--- a/e2e/pod.go
+++ b/e2e/pod.go
@@ -111,11 +111,11 @@ func getCommandInPodOpts(f *framework.Framework, c, ns string, opt *metav1.ListO
 }
 
 func execCommandInPod(f *framework.Framework, c, ns string, opt *metav1.ListOptions) (string, string, error) {
-	podPot, err := getCommandInPodOpts(f, c, ns, opt)
+	podOpt, err := getCommandInPodOpts(f, c, ns, opt)
 	if err != nil {
 		return "", "", err
 	}
-	stdOut, stdErr, err := f.ExecWithOptions(podPot)
+	stdOut, stdErr, err := f.ExecWithOptions(podOpt)
 	if stdErr != "" {
 		e2elog.Logf("stdErr occurred: %v", stdErr)
 	}
@@ -124,13 +124,13 @@ func execCommandInPod(f *framework.Framework, c, ns string, opt *metav1.ListOpti
 
 func execCommandInToolBoxPod(f *framework.Framework, c, ns string) (string, string, error) {
 	opt := &metav1.ListOptions{
-		LabelSelector: rookTolBoxPodLabel,
+		LabelSelector: rookToolBoxPodLabel,
 	}
-	podPot, err := getCommandInPodOpts(f, c, ns, opt)
+	podOpt, err := getCommandInPodOpts(f, c, ns, opt)
 	if err != nil {
 		return "", "", err
 	}
-	stdOut, stdErr, err := f.ExecWithOptions(podPot)
+	stdOut, stdErr, err := f.ExecWithOptions(podOpt)
 	if stdErr != "" {
 		e2elog.Logf("stdErr occurred: %v", stdErr)
 	}
@@ -138,11 +138,11 @@ func execCommandInToolBoxPod(f *framework.Framework, c, ns string) (string, stri
 }
 
 func execCommandInPodAndAllowFail(f *framework.Framework, c, ns string, opt *metav1.ListOptions) (string, string) {
-	podPot, err := getCommandInPodOpts(f, c, ns, opt)
+	podOpt, err := getCommandInPodOpts(f, c, ns, opt)
 	if err != nil {
 		return "", err.Error()
 	}
-	stdOut, stdErr, err := f.ExecWithOptions(podPot)
+	stdOut, stdErr, err := f.ExecWithOptions(podOpt)
 	if err != nil {
 		e2elog.Logf("command %s failed: %v", c, err)
 	}
diff --git a/e2e/pvc.go b/e2e/pvc.go
index 20eaba427..64dc866f0 100644
--- a/e2e/pvc.go
+++ b/e2e/pvc.go
@@ -144,7 +144,7 @@ func getPVCAndPV(c kubernetes.Interface, pvcName, pvcNamespace string) (*v1.Pers
 	}
 	pv, err := c.CoreV1().PersistentVolumes().Get(context.TODO(), pvc.Spec.VolumeName, metav1.GetOptions{})
 	if err != nil {
-		return pvc, nil, fmt.Errorf("failed to delete PV with error %v", err)
+		return pvc, nil, fmt.Errorf("failed to get PV with error %v", err)
 	}
 	return pvc, pv, nil
 }
diff --git a/e2e/utils.go b/e2e/utils.go
index 3602d450b..fa8b1d335 100644
--- a/e2e/utils.go
+++ b/e2e/utils.go
@@ -28,8 +28,8 @@ const (
 	defaultNs     = "default"
 	vaultSecretNs = "/secret/ceph-csi/"
 
-	rookTolBoxPodLabel = "app=rook-ceph-tools"
-	rbdmountOptions    = "mountOptions"
+	rookToolBoxPodLabel = "app=rook-ceph-tools"
+	rbdmountOptions     = "mountOptions"
 
 	retainPolicy = v1.PersistentVolumeReclaimRetain
 	// deletePolicy is the default policy in E2E.