tiny fix

pingcap · Feb 27, 2019 · b6000b5 · b6000b5
1 parent a58e58c
commit b6000b5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/tests/e2e/create.go b/tests/e2e/create.go
@@ -15,7 +15,6 @@ package e2e
 
 import (
 	"database/sql"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
 	"io/ioutil"
@@ -60,13 +59,14 @@ type Response struct {
 func testCreate(ns, clusterName string) {
 	By(fmt.Sprintf("When create the TiDB cluster: %s/%s", ns, clusterName))
 	instanceName := getInstanceName(ns, clusterName)
-	err := createSecret(ns, clusterName)
-	Expect(err).NotTo(HaveOccurred())
 
 	cmdStr := fmt.Sprintf("helm install /charts/tidb-cluster -f /tidb-cluster-values.yaml"+
 		" -n %s --namespace=%s --set clusterName=%s,tidb.passwordSecretName=%s",
 		instanceName, ns, clusterName, ns+"-"+clusterName)
-	_, err = execCmd(cmdStr)
+	_, err := execCmd(cmdStr)
+	Expect(err).NotTo(HaveOccurred())
+
+	err = createSecret(ns, clusterName)
 	Expect(err).NotTo(HaveOccurred())
 
 	By("Then all members should running")
@@ -602,7 +602,7 @@ func createSecret(ns, clusterName string) error {
 			Namespace: ns,
 		},
 		Data: map[string][]byte{
-			"root": []byte(base64.StdEncoding.EncodeToString([]byte(password))),
+			"root": []byte(password),
 		},
 		Type: corev1.SecretTypeOpaque,
 	}

diff --git a/tests/e2e/test_helper.go b/tests/e2e/test_helper.go
@@ -101,7 +101,7 @@ func clearOperator() error {
 			return err
 		}
 		err = kubeCli.CoreV1().Secrets(fixture.ns).Delete(fixture.ns+"-"+fixture.clusterName, nil)
-		if err != nil && apierrs.IsNotFound(err) {
+		if err != nil && !apierrs.IsNotFound(err) {
 			return err
 		}
 	}