cmd/protoc-gen-go-grpc: remove replace and skip test that requires it for now (#7451)

dfawley · web-flow · commit 245323ca620b · 2024-07-29T09:45:38.000-07:00
diff --git a/cmd/protoc-gen-go-grpc/go.mod b/cmd/protoc-gen-go-grpc/go.mod
@@ -13,5 +13,3 @@ require (
 	golang.org/x/text v0.16.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect
 )
-
-replace google.golang.org/grpc => ../..
diff --git a/cmd/protoc-gen-go-grpc/go.sum b/cmd/protoc-gen-go-grpc/go.sum
@@ -8,5 +8,7 @@ golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
 golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 h1:1GBuWVLM/KMVUv1t1En5Gs+gFZCNd360GGb4sSxtrhU=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117/go.mod h1:EfXuqaE1J41VCDicxHzUDm+8rk+7ZdXzHV0IhO/I6s0=
+google.golang.org/grpc v1.65.0 h1:bs/cUb4lp1G5iImFFd3u5ixQzweKizoZJAwBNLR42lc=
+google.golang.org/grpc v1.65.0/go.mod h1:WgYC2ypjlB0EiQi6wdKixMqukr6lBc0Vo+oOgjrM5ZQ=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
diff --git a/cmd/protoc-gen-go-grpc/unimpl_test.go b/cmd/protoc-gen-go-grpc/unimpl_test.go
@@ -34,13 +34,16 @@ type unimplEmbeddedByValue struct {
 }
 
 func TestUnimplementedEmbedding(t *testing.T) {
+	t.Skip("Skip until next grpc release includes panic during registration.")
+
 	// Embedded by value, this should succeed.
 	testgrpc.RegisterTestServiceServer(grpc.NewServer(), &unimplEmbeddedByValue{})
 	defer func() {
 		if recover() == nil {
 			t.Fatalf("Expected panic; received none")
 		}
 	}()
+
 	// Embedded by pointer, this should panic.
 	testgrpc.RegisterTestServiceServer(grpc.NewServer(), &unimplEmbeddedByPointer{})
 }

Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,3 @@ require (`
`13`	`13`	`golang.org/x/text v0.16.0 // indirect`
`14`	`14`	`google.golang.org/genproto/googleapis/rpc v0.0.0-20240604185151-ef581f913117 // indirect`
`15`	`15`	`)`
`16`		`-`
`17`		`-replace google.golang.org/grpc => ../..`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,16 @@ type unimplEmbeddedByValue struct {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`func TestUnimplementedEmbedding(t *testing.T) {`
	`37`	`+ t.Skip("Skip until next grpc release includes panic during registration.")`
	`38`	`+`
`37`	`39`	`// Embedded by value, this should succeed.`
`38`	`40`	`testgrpc.RegisterTestServiceServer(grpc.NewServer(), &unimplEmbeddedByValue{})`
`39`	`41`	`defer func() {`
`40`	`42`	`if recover() == nil {`
`41`	`43`	`t.Fatalf("Expected panic; received none")`
`42`	`44`	`}`
`43`	`45`	`}()`
	`46`	`+`
`44`	`47`	`// Embedded by pointer, this should panic.`
`45`	`48`	`testgrpc.RegisterTestServiceServer(grpc.NewServer(), &unimplEmbeddedByPointer{})`
`46`	`49`	`}`