fix:issue polarismesh#692

chuntaojun · Sep 23, 2022 · c3da167 · c3da167
1 parent 805dace
commit c3da167
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 24 deletions.
diff --git a/test/http/circuitbreaker_config.go b/test/http/circuitbreaker_config.go
@@ -92,7 +92,7 @@ func (c *Client) CreateCircuitBreakers(circuitBreakers []*api.CircuitBreaker) (*
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateCircuitBreakersResponse(ret, circuitBreakers)
@@ -118,7 +118,7 @@ func (c *Client) CreateCircuitBreakerVersions(circuitBreakers []*api.CircuitBrea
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateCircuitBreakersResponse(ret, circuitBreakers)

diff --git a/test/http/client.go b/test/http/client.go
@@ -105,11 +105,12 @@ func GetBatchWriteResponse(response *http.Response) (*api.BatchWriteResponse, er
 		fmt.Printf("%+v\n", ret)
 	} else {
 		fmt.Printf("%v\n", checkErr)
+		ret = nil
 	}
 
 	// 检查回复
 	if response.StatusCode != 200 {
-		return nil, errors.New("invalid http code")
+		return ret, fmt.Errorf("invalid http code : %d, ret code : %d", response.StatusCode, ret.GetCode().GetValue())
 	}
 
 	if checkErr == nil {

diff --git a/test/http/instance.go b/test/http/instance.go
@@ -75,7 +75,7 @@ func (c *Client) CreateInstances(instances []*api.Instance) (*api.BatchWriteResp
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateInstancesResponse(ret, instances)

diff --git a/test/http/namespace.go b/test/http/namespace.go
@@ -71,7 +71,7 @@ func (c *Client) CreateNamespaces(namespaces []*api.Namespace) (*api.BatchWriteR
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateNamespacesResponse(ret, namespaces)
@@ -129,7 +129,7 @@ func (c *Client) DeleteNamespacesGetResp(namespaces []*api.Namespace) (*api.Batc
 	resp, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return resp, err
 	}
 
 	return resp, nil

diff --git a/test/http/ratelimit_config.go b/test/http/ratelimit_config.go
@@ -76,7 +76,7 @@ func (c *Client) CreateRateLimits(rateLimits []*api.Rule) (*api.BatchWriteRespon
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateRateLimitsResponse(ret, rateLimits)

diff --git a/test/http/service.go b/test/http/service.go
@@ -76,7 +76,7 @@ func (c *Client) CreateServices(services []*api.Service) (*api.BatchWriteRespons
 	ret, err := GetBatchWriteResponse(response)
 	if err != nil {
 		fmt.Printf("%v\n", err)
-		return nil, err
+		return ret, err
 	}
 
 	return checkCreateServicesResponse(ret, services)

diff --git a/test/namespace_test.go b/test/namespace_test.go
@@ -146,11 +146,13 @@ func TestDeleteNamespaceWhenHaveService(t *testing.T) {
 	}
 
 	resp, err := client.DeleteNamespacesGetResp(namespaces)
-	if err != nil {
-		t.Fatalf("delete namespaces fail: %s", err.Error())
+	if resp != nil {
+		if resp.GetCode().GetValue() != v1.NamespaceExistedServices {
+			t.Fatalf("delete namespace need return code:NamespaceExistedServices, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+		}
 	}
-	if resp.GetCode().GetValue() != v1.NamespaceExistedServices {
-		t.Fatalf("delete namespace need return code:NamespaceExistedServices, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+	if err != nil && resp == nil {
+		t.Fatalf("delete namespaces fail: %s", err.Error())
 	}
 
 	// 删除 service
@@ -159,11 +161,13 @@ func TestDeleteNamespaceWhenHaveService(t *testing.T) {
 	}
 
 	resp, err = client.DeleteNamespacesGetResp(namespaces)
-	if err != nil {
-		t.Fatalf("delete namespaces fail: %s", err.Error())
+	if resp != nil {
+		if resp.GetCode().GetValue() != v1.ExecuteSuccess {
+			t.Fatalf("delete namespace need return code:ExecuteSuccess, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+		}
 	}
-	if resp.GetCode().GetValue() != v1.ExecuteSuccess {
-		t.Fatalf("delete namespace need return code:ExecuteSuccess, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+	if err != nil && resp == nil {
+		t.Fatalf("delete namespaces fail: %s", err.Error())
 	}
 }
 
@@ -187,11 +191,13 @@ func TestDeleteNamespaceWhenHaveConfigGroup(t *testing.T) {
 	}
 
 	resp, err := client.DeleteNamespacesGetResp(namespaces)
-	if err != nil {
-		t.Fatalf("delete namespaces fail: %s", err.Error())
+	if resp != nil {
+		if resp.GetCode().GetValue() != v1.NamespaceExistedConfigGroups {
+			t.Fatalf("delete namespace need return code:NamespaceExistedConfigGroups, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+		}
 	}
-	if resp.GetCode().GetValue() != v1.NamespaceExistedConfigGroups {
-		t.Fatalf("delete namespace need return code:NamespaceExistedConfigGroups, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+	if err != nil && resp == nil {
+		t.Fatalf("delete namespaces fail: %s", err.Error())
 	}
 
 	// 删除配置分组
@@ -200,11 +206,13 @@ func TestDeleteNamespaceWhenHaveConfigGroup(t *testing.T) {
 	}
 
 	resp, err = client.DeleteNamespacesGetResp(namespaces)
-	if err != nil {
-		t.Fatalf("delete namespaces fail: %s", err.Error())
+	if resp != nil {
+		if resp.GetCode().GetValue() != v1.ExecuteSuccess {
+			t.Fatalf("delete namespace need return code:ExecuteSuccess, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+		}
 	}
-	if resp.GetCode().GetValue() != v1.ExecuteSuccess {
-		t.Fatalf("delete namespace need return code:ExecuteSuccess, actual : %d, %s", int(resp.GetCode().GetValue()), resp.GetInfo().GetValue())
+	if err != nil && resp == nil {
+		t.Fatalf("delete namespaces fail: %s", err.Error())
 	}
 }