add more checks for nil pointer to prevent segmentation fault issue

Author: Peng Zhou

test/e2e/clustering_test.go

@@ -78,9 +78,22 @@ func TestClusterJoin(t *testing.T) {
 		SetRetryCount(5).
 		SetRetryFixedInterval(10 * time.Second).
 		AddRetryCondition(func(resp *req.Response, err error) bool {
+			if resp == nil || err != nil {
+				t.Logf("error in AddRetryCondition: %s", err.Error())
+				return true
+			}
+			if resp.Response == nil {
+				t.Log("Could not get the Response Object, Retrying...")
+				return true
+			}
+			if resp.Body == nil {
+				t.Log("Could not get the body for the response, Retrying...")
+				return true
+			}
 			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				t.Logf("error: %s", err.Error())
+			if body == nil || err != nil {
+				t.Logf("error in read response body: %s", err.Error())
+				return true
 			}
 			totalHosts := gjson.Get(string(body), `host-default-list.list-items.list-count.value`)
 			numOfHosts = int(totalHosts.Num)

test/e2e/scaling_test.go

@@ -95,10 +95,22 @@ func TestHelmScaleUp(t *testing.T) {
 		SetRetryCount(3).
 		SetRetryFixedInterval(10 * time.Second).
 		AddRetryCondition(func(resp *req.Response, err error) bool {
-
+			if resp == nil || err != nil {
+				t.Logf("error in AddRetryCondition: %s", err.Error())
+				return true
+			}
+			if resp.Response == nil {
+				t.Log("Could not get the Response Object, Retrying...")
+				return true
+			}
+			if resp.Body == nil {
+				t.Log("Could not get the body for the response, Retrying...")
+				return true
+			}
 			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				t.Logf("error: %s", err.Error())
+			if body == nil || err != nil {
+				t.Logf("error in read response body: %s", err.Error())
+				return true
 			}
 			totalHosts := gjson.Get(string(body), `host-status-list.status-list-summary.total-hosts.value`)
 			numOfHosts = int(totalHosts.Num)
@@ -198,10 +210,22 @@ func TestHelmScaleDown(t *testing.T) {
 		SetRetryCount(3).
 		SetRetryFixedInterval(10 * time.Second).
 		AddRetryCondition(func(resp *req.Response, err error) bool {
-
+			if resp == nil || err != nil {
+				t.Logf("error in AddRetryCondition: %s", err.Error())
+				return true
+			}
+			if resp.Response == nil {
+				t.Log("Could not get the Response Object, Retrying...")
+				return true
+			}
+			if resp.Body == nil {
+				t.Log("Could not get the body for the response, Retrying...")
+				return true
+			}
 			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				t.Logf("error: %s", err.Error())
+			if body == nil || err != nil {
+				t.Logf("error in read response body: %s", err.Error())
+				return true
 			}
 			totalOfflineHosts := gjson.Get(string(body), `host-status-list.status-list-summary.total-hosts-offline.value`)
 			numOfHostsOffline = int(totalOfflineHosts.Num)

test/e2e/separate_nodes_test.go

@@ -184,14 +184,27 @@ func TestSeparateEDnode(t *testing.T) {
 
 	enodeHostCountJSON := 0
 	client := req.C()
-	reqResp, reqErr := client.R().
+	_, reqErr := client.R().
 		SetDigestAuth(username, password).
 		SetRetryCount(3).
 		SetRetryFixedInterval(10 * time.Second).
 		AddRetryCondition(func(resp *req.Response, err error) bool {
+			if resp == nil || err != nil {
+				t.Logf("error in AddRetryCondition: %s", err.Error())
+				return true
+			}
+			if resp.Response == nil {
+				t.Log("Could not get the Response Object, Retrying...")
+				return true
+			}
+			if resp.Body == nil {
+				t.Log("Could not get the body for the response, Retrying...")
+				return true
+			}
 			body, err := io.ReadAll(resp.Body)
-			if err != nil {
-				t.Logf("error: %s", err.Error())
+			if body == nil || err != nil {
+				t.Logf("error in read response body: %s", err.Error())
+				return true
 			}
 			totalHosts := gjson.Get(string(body), `group-default.relations.relation-group.#(typeref="hosts").relation-count.value`)
 			enodeHostCountJSON = int(totalHosts.Num)
@@ -201,7 +214,6 @@ func TestSeparateEDnode(t *testing.T) {
 			return enodeHostCountJSON != 2
 		}).
 		Get("http://localhost:8002/manage/v2/groups/enode?format=json")
-	defer reqResp.Body.Close()
 
 	if reqErr != nil {
 		t.Fatalf(reqErr.Error())