opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change end2end test

Browse Source
This commit is contained in:
yangzhouhan
2015-08-10 16:59:16 -07:00
parent 54f53f005e
commit bf963e1bb3
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
interop/client/client.go
View File

@ -381,12 +381,6 @@ func main() {
grpclog.Fatalf("Failed to create JWT credentials: %v", err) grpclog.Fatalf("Failed to create JWT credentials: %v", err)
} }
opts = append(opts, grpc.WithPerRPCCredentials(jwtCreds)) opts = append(opts, grpc.WithPerRPCCredentials(jwtCreds))
} else if *testCase == "jwt_token_creds" {
jwtCreds, err := oauth.NewServiceAccountFromFile(*serviceAccountKeyFile, *oauthScope)
if err != nil {
grpclog.Fatalf("Failed to create JWT credentials: %v", err)
}
opts = append(opts, grpc.WithPerRPCCredentials(jwtCreds))
} }
} }
conn, err := grpc.Dial(serverAddr, opts...) conn, err := grpc.Dial(serverAddr, opts...)

6
test/end2end_test.go
View File

@ -75,7 +75,11 @@ func (s *testServer) EmptyCall(ctx context.Context, in *testpb.Empty) (*testpb.E
if _, ok := md["user-agent"]; !ok { if _, ok := md["user-agent"]; !ok {
return nil, grpc.Errorf(codes.DataLoss, "got extra metadata") return nil, grpc.Errorf(codes.DataLoss, "got extra metadata")
} }
grpc.SendHeader(ctx, metadata.Pairs("ua", md["user-agent"][0])) var str []string
for _,entry := range md["user-agent"]{
str = append(str,"ua",entry)
}
grpc.SendHeader(ctx, metadata.Pairs(str...))
} }
return new(testpb.Empty), nil return new(testpb.Empty), nil
} }