Merge branch 'main' into dependabot/go_modules/contrib/registry/zookeeper/golang.org/x/sync-0.2.0

errors/errors_test.go

@@ -9,7 +9,6 @@ import (
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/grpc/test/grpc_testing"
 )
 
 type TestError struct{ message string }
@@ -56,7 +55,7 @@ func TestErrors(t *testing.T) {
 		t.Errorf("got %+v want %+v", se, err)
 	}
 
-	gs2, _ := status.New(codes.InvalidArgument, "bad request").WithDetails(&grpc_testing.Empty{})
+	gs2 := status.New(codes.InvalidArgument, "bad request")
 	se2 := FromError(gs2.Err())
 	// codes.InvalidArgument should convert to http.StatusBadRequest
 	if se2.Code != http.StatusBadRequest {