Skip to content

Commit

Permalink
tests: Uniformly check returned error on OK response
Browse files Browse the repository at this point in the history 
See opiproject/opi-spdk-bridge#501

Signed-off-by: Boris Glimcher <[email protected]>
  • Loading branch information
@glimchb
glimchb committed Jul 11, 2023
1 parent 2a9e655 commit 10dace6
Show file tree
Hide file tree
Showing 4 changed files with 136 additions and 128 deletions.
66 changes: 34 additions & 32 deletions pkg/evpn/interface_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ func Test_CreateInterface(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -178,16 +178,18 @@ func Test_DeleteInterface(t *testing.T) {

request := &pb.DeleteInterfaceRequest{Name: fname1, AllowMissing: tt.missing}
response, err := client.DeleteInterface(ctx, request)
if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}

if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}

if reflect.TypeOf(response) != reflect.TypeOf(tt.out) {
t.Error("response: expected", reflect.TypeOf(tt.out), "received", reflect.TypeOf(response))
}
Expand Down Expand Up @@ -280,15 +282,15 @@ func Test_UpdateInterface(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -358,15 +360,15 @@ func Test_GetInterface(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down
66 changes: 34 additions & 32 deletions pkg/evpn/svi_subnet_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,15 @@ func Test_CreateSubnet(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -184,16 +184,18 @@ func Test_DeleteSubnet(t *testing.T) {

request := &pb.DeleteSubnetRequest{Name: fname1, AllowMissing: tt.missing}
response, err := client.DeleteSubnet(ctx, request)
if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}

if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}

if reflect.TypeOf(response) != reflect.TypeOf(tt.out) {
t.Error("response: expected", reflect.TypeOf(tt.out), "received", reflect.TypeOf(response))
}
Expand Down Expand Up @@ -291,15 +293,15 @@ func Test_UpdateSubnet(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -369,15 +371,15 @@ func Test_GetSubnet(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down
66 changes: 34 additions & 32 deletions pkg/evpn/tunnel_vxlan_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,15 +111,15 @@ func Test_CreateTunnel(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -189,16 +189,18 @@ func Test_DeleteTunnel(t *testing.T) {

request := &pb.DeleteTunnelRequest{Name: fname1, AllowMissing: tt.missing}
response, err := client.DeleteTunnel(ctx, request)
if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}

if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}

if reflect.TypeOf(response) != reflect.TypeOf(tt.out) {
t.Error("response: expected", reflect.TypeOf(tt.out), "received", reflect.TypeOf(response))
}
Expand Down Expand Up @@ -301,15 +303,15 @@ func Test_UpdateTunnel(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -379,15 +381,15 @@ func Test_GetTunnel(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down
66 changes: 34 additions & 32 deletions pkg/evpn/vrf_vpc_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,15 @@ func Test_CreateVpc(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -178,16 +178,18 @@ func Test_DeleteVpc(t *testing.T) {

request := &pb.DeleteVpcRequest{Name: fname1, AllowMissing: tt.missing}
response, err := client.DeleteVpc(ctx, request)
if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}

if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}

if reflect.TypeOf(response) != reflect.TypeOf(tt.out) {
t.Error("response: expected", reflect.TypeOf(tt.out), "received", reflect.TypeOf(response))
}
Expand Down Expand Up @@ -280,15 +282,15 @@ func Test_UpdateVpc(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down Expand Up @@ -358,15 +360,15 @@ func Test_GetVpc(t *testing.T) {
}
}

if err != nil {
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
if er, ok := status.FromError(err); ok {
if er.Code() != tt.errCode {
t.Error("error code: expected", tt.errCode, "received", er.Code())
}
if er.Message() != tt.errMsg {
t.Error("error message: expected", tt.errMsg, "received", er.Message())
}
} else {
t.Error("expected grpc error status")
}
})
}
Expand Down

0 comments on commit 10dace6

Please sign in to comment.