Quellcode durchsuchen

rpctypes: test error equivalence with Error()

grpc.Errorf() now returns *rpcError, which makes comparisons shallow.
Anthony Romano vor 9 Jahren
Ursprung
Commit
51c5c307fa
1 geänderte Dateien mit 4 neuen und 4 gelöschten Zeilen
  1. 4 4
      etcdserver/api/v3rpc/rpctypes/error_test.go

+ 4 - 4
etcdserver/api/v3rpc/rpctypes/error_test.go

@@ -26,15 +26,15 @@ func TestConvert(t *testing.T) {
 	e2 := ErrGRPCEmptyKey
 	e2 := ErrGRPCEmptyKey
 	e3 := ErrEmptyKey
 	e3 := ErrEmptyKey
 
 
-	if e1 != e2 {
-		t.Fatalf("expected 'true', got %T != %T", e1, e2)
+	if e1.Error() != e2.Error() {
+		t.Fatalf("expected %q == %q", e1.Error(), e2.Error())
 	}
 	}
 	if grpc.Code(e1) != e3.(EtcdError).Code() {
 	if grpc.Code(e1) != e3.(EtcdError).Code() {
 		t.Fatalf("expected them to be equal, got %v / %v", grpc.Code(e1), e3.(EtcdError).Code())
 		t.Fatalf("expected them to be equal, got %v / %v", grpc.Code(e1), e3.(EtcdError).Code())
 	}
 	}
 
 
-	if e1 == e3 {
-		t.Fatalf("expected 'false', got %T == %T", e1, e3)
+	if e1.Error() == e3.Error() {
+		t.Fatalf("expected %q != %q", e1.Error(), e3.Error())
 	}
 	}
 	if grpc.Code(e2) != e3.(EtcdError).Code() {
 	if grpc.Code(e2) != e3.(EtcdError).Code() {
 		t.Fatalf("expected them to be equal, got %v / %v", grpc.Code(e2), e3.(EtcdError).Code())
 		t.Fatalf("expected them to be equal, got %v / %v", grpc.Code(e2), e3.(EtcdError).Code())