refactor separate nodes test

Author: pengzhouml

test/e2e/separate_nodes_test.go

@@ -3,7 +3,6 @@ package e2e
 import (
 	"fmt"
 	"io/ioutil"
-	"net/http"
 	"os"
 	"path/filepath"
 	"strings"
@@ -13,15 +12,12 @@ import (
 	"github.com/gruntwork-io/terratest/modules/helm"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
+	"github.com/stretchr/testify/assert"
 	"github.com/tidwall/gjson"
 	digestAuth "github.com/xinsnake/go-http-digest-auth-client"
 )
 
 func TestSeparateEDnode(t *testing.T) {
-	var resp *http.Response
-	var body []byte
-	var err error
-
 	username := "admin"
 	password := "admin"
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
@@ -86,11 +82,13 @@ func TestSeparateEDnode(t *testing.T) {
 
 	getHostsDR := digestAuth.NewRequest(username, password, "GET", hostsEndpoint, "")
 
-	if resp, err = getHostsDR.Execute(); err != nil {
+	resp, err := getHostsDR.Execute()
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 	defer resp.Body.Close()
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 	t.Logf("Get hosts response:\n" + string(body))
@@ -149,12 +147,14 @@ func TestSeparateEDnode(t *testing.T) {
 
 	getEnodeDR := digestAuth.NewRequest(username, password, "GET", enodeEndpoint, "")
 
-	if resp, err = getEnodeDR.Execute(); err != nil {
+	resp, err = getEnodeDR.Execute()
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 	defer resp.Body.Close()
 
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+	body, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 	t.Logf("Get enode group response:\n" + string(body))
@@ -169,10 +169,6 @@ func TestSeparateEDnode(t *testing.T) {
 }
 
 func TestIncorrectBootsrapHostname(t *testing.T) {
-	var resp *http.Response
-	var body []byte
-	var err error
-
 	username := "admin"
 	password := "admin"
 	imageRepo, repoPres := os.LookupEnv("dockerRepository")
@@ -184,7 +180,7 @@ func TestIncorrectBootsrapHostname(t *testing.T) {
 	dnodePodName := dnodeReleaseName + "-marklogic-0"
 
 	// Incorrect boostrap hostname for negative test
-	bootstrapHost := "Incorrect Host Name"
+	incorrectBootstrapHost := "Incorrect Host Name"
 
 	// Path to the helm chart we will test
 	helmChartPath, e := filepath.Abs("../../charts")
@@ -240,19 +236,19 @@ func TestIncorrectBootsrapHostname(t *testing.T) {
 	t.Logf(`Endpoint: %s`, hostsEndpoint)
 
 	getHostsRequest := digestAuth.NewRequest(username, password, "GET", hostsEndpoint, "")
-
-	if resp, err = getHostsRequest.Execute(); err != nil {
+	resp, err := getHostsRequest.Execute()
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 
 	defer resp.Body.Close()
 
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+	body, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
 
-	t.Logf("Response:\n" + string(body))
-	t.Logf(`BootstrapHost: = %s`, bootstrapHost)
+	t.Logf(`BootstrapHost: = %s`, incorrectBootstrapHost)
 
 	// Helm options for enode creation
 	enodeOptions := &helm.Options{
@@ -265,7 +261,7 @@ func TestIncorrectBootsrapHostname(t *testing.T) {
 			"auth.adminUsername":    username,
 			"auth.adminPassword":    password,
 			"group.name":            "enode",
-			"bootstrapHostName":     bootstrapHost,
+			"bootstrapHostName":     incorrectBootstrapHost,
 			"logCollection.enabled": "false",
 		},
 	}
@@ -276,32 +272,34 @@ func TestIncorrectBootsrapHostname(t *testing.T) {
 	// Give pod time to fail before checking if it did
 	time.Sleep(20 * time.Second)
 
+	totalHostsJSON := gjson.Get(string(body), "host-default-list.list-items.list-count.value")
+
+	// Total hosts be one as second host should have failed to create
+	if totalHostsJSON.Num != 1 {
+		t.Errorf("Wrong number of hosts: %v instead of 1", totalHostsJSON.Num)
+	}
+
 	// Verify clustering failed given incorrect hostname
 	clusterStatusEndpoint := fmt.Sprintf("http://%s/manage/v2?view=status", tunnel.Endpoint())
 	clusterStatus := digestAuth.NewRequest(username, password, "GET", clusterStatusEndpoint, "")
 	t.Logf(`clusterStatusEndpoint: %s`, clusterStatusEndpoint)
-	if resp, err = clusterStatus.Execute(); err != nil {
+	resp, err = clusterStatus.Execute()
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
-	totalHostsJSON := gjson.Get(string(body), "host-default-list.list-items.list-count.value")
-	// Total hosts be one as second host should have failed to create
-	if totalHostsJSON.Num != 1 {
-		t.Errorf("Wrong number of hosts: %v instead of 1", totalHostsJSON.Num)
+	_, err = ioutil.ReadAll(resp.Body)
+	if err != nil {
+		t.Fatalf(err.Error())
 	}
-	t.Logf("\nCluster Status Response:\n\n" + string(body))
 
 	// Verify enode group creation failed given incorrect hostname
 	enodeGroupStatusEndpoint := fmt.Sprintf("http://%s/manage/v2/groups/enode", tunnel.Endpoint())
 	groupStatus := digestAuth.NewRequest(username, password, "GET", enodeGroupStatusEndpoint, "")
 	t.Logf(`enodeGroupStatusEndpoint: %s`, enodeGroupStatusEndpoint)
-	if resp, err = groupStatus.Execute(); err != nil {
+	resp, err = groupStatus.Execute()
+	if err != nil {
 		t.Fatalf(err.Error())
 	}
-	if body, err = ioutil.ReadAll(resp.Body); err != nil {
-		t.Fatalf(err.Error())
-	}
-	if !strings.Contains(string(body), "404") {
-		t.Errorf("Enode group should not exist")
-	}
-	t.Logf("Enode group status response:\n" + string(body))
+	// the request for enode should be 404
+	assert.Equal(t, 404, resp.StatusCode)
 }