mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: use testify instead of t.Fatal or t.Error in api package

Browse Source 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
This commit is contained in:
Matthieu MOREL 2024-11-30 13:33:26 +01:00
parent 3d46df15f7
commit d714b904e9
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
api/etcdserverpb/raft_internal_stringer_test.go
View File

@ -17,6 +17,8 @@ package etcdserverpb_test
import ( import (
"testing" "testing"
"github.com/stretchr/testify/assert"
pb "go.etcd.io/etcd/api/v3/etcdserverpb" pb "go.etcd.io/etcd/api/v3/etcdserverpb"
) )
@ -24,8 +26,5 @@ import (
// panic: invalid Go type int for field k8s_io.kubernetes.vendor.go_etcd_io.etcd.etcdserver.etcdserverpb.loggablePutRequest.value_size // panic: invalid Go type int for field k8s_io.kubernetes.vendor.go_etcd_io.etcd.etcdserver.etcdserverpb.loggablePutRequest.value_size
// See https://github.com/kubernetes/kubernetes/issues/91937 for more details // See https://github.com/kubernetes/kubernetes/issues/91937 for more details
func TestInvalidGoTypeIntPanic(t *testing.T) { func TestInvalidGoTypeIntPanic(t *testing.T) {
result := pb.NewLoggablePutRequest(&pb.PutRequest{}).String() assert.Empty(t, pb.NewLoggablePutRequest(&pb.PutRequest{}).String())
if result != "" {
t.Errorf("Got result: %s, expected empty string", result)
}
} }

17
api/v3rpc/rpctypes/error_test.go
View File

@ -18,6 +18,7 @@ import (
"errors" "errors"
"testing" "testing"
"github.com/stretchr/testify/require"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/status" "google.golang.org/grpc/status"
) )
@ -28,17 +29,13 @@ func TestConvert(t *testing.T) {
var e3 EtcdError var e3 EtcdError
errors.As(ErrEmptyKey, &e3) errors.As(ErrEmptyKey, &e3)
if e1.Error() != e2.Error() { require.Equal(t, e1.Error(), e2.Error())
t.Fatalf("expected %q == %q", e1.Error(), e2.Error()) if ev1, ok := status.FromError(e1); ok {
} require.Equal(t, ev1.Code(), e3.Code())
if ev1, ok := status.FromError(e1); ok && ev1.Code() != e3.Code() {
t.Fatalf("expected them to be equal, got %v / %v", ev1.Code(), e3.Code())
} }
if e1.Error() == e3.Error() { require.NotEqual(t, e1.Error(), e3.Error())
t.Fatalf("expected %q != %q", e1.Error(), e3.Error()) if ev2, ok := status.FromError(e2); ok {
} require.Equal(t, ev2.Code(), e3.Code())
if ev2, ok := status.FromError(e2); ok && ev2.Code() != e3.Code() {
t.Fatalf("expected them to be equal, got %v / %v", ev2.Code(), e3.Code())
} }
} }