hack: change internal package name for grpc.reflection.v1 to prevent …

…possible init crash (#555)
jhump · Mar 3, 2023 · 81aa758 · 81aa758
1 parent 7923b75
commit 81aa758
Show file tree

Hide file tree

Showing 6 changed files with 240 additions and 194 deletions.
diff --git a/grpcreflect/client_test.go b/grpcreflect/client_test.go
@@ -376,9 +376,11 @@ func TestAutoVersion(t *testing.T) {
 		testClientAuto(t,
 			func(s *grpc.Server) {
 				grpc_reflection_v1.Register(s)
+				// HACK: The above won't show up in list of service names, so we need at least one other.
+				testprotosgrpc.RegisterDummyServiceServer(s, testService{})
 			},
 			[]string{
-				"grpc.reflection.v1.ServerReflection",
+				"testprotos.DummyService",
 			},
 			[]string{
 				"/grpc.reflection.v1.ServerReflection/ServerReflectionInfo",
@@ -392,9 +394,11 @@ func TestAutoVersion(t *testing.T) {
 		testClientAuto(t,
 			func(s *grpc.Server) {
 				reflection.Register(s)
+				testprotosgrpc.RegisterDummyServiceServer(s, testService{})
 			},
 			[]string{
 				"grpc.reflection.v1alpha.ServerReflection",
+				"testprotos.DummyService",
 			},
 			[]string{
 				// first one fails, so falls back to v1alpha
@@ -414,10 +418,11 @@ func TestAutoVersion(t *testing.T) {
 			func(s *grpc.Server) {
 				grpc_reflection_v1.Register(s)
 				reflection.Register(s)
+				testprotosgrpc.RegisterDummyServiceServer(s, testService{})
 			},
 			[]string{
-				"grpc.reflection.v1.ServerReflection",
 				"grpc.reflection.v1alpha.ServerReflection",
+				"testprotos.DummyService",
 			},
 			[]string{
 				// never uses v1alpha since v1 works