unistack-org/micro
3
0
Fork 3
Code Issues 14 Pull Requests 2 Actions Packages Projects Releases 242 Wiki Activity

service/grpc: t.Fatal out of TestGRPCTLSService() goroutine

Browse Source
This commit is contained in:
Lars Lehtonen 2019-12-11 08:28:49 -08:00
parent 27bab29e3c
commit fd531349d7
No known key found for this signature in database
GPG Key ID: 8137D474EBCB04F2
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
service/grpc/grpc_test.go
View File

@ -162,10 +162,10 @@ func TestGRPCTLSService(t *testing.T) {
hello.RegisterTestHandler(service.Server(), &testHandler{}) hello.RegisterTestHandler(service.Server(), &testHandler{})
// run service // run service
errCh := make(chan error, 1)
go func() { go func() {
if err := service.Run(); err != nil { defer close(errCh)
t.Fatal(err) errCh <- service.Run()
}
}() }()
// wait for start // wait for start
@ -175,13 +175,23 @@ func TestGRPCTLSService(t *testing.T) {
test := hello.NewTestService("test.service", service.Client()) test := hello.NewTestService("test.service", service.Client())
// call service // call service
rsp, err := test.Call(context.Background(), &hello.Request{ ctx2, cancel2 := context.WithTimeout(context.Background(), time.Duration(time.Second))
defer cancel2()
rsp, err := test.Call(ctx2, &hello.Request{
Name: "John", Name: "John",
}) })
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// check server
select {
case err := <-errCh:
t.Fatal(err)
case <-time.After(time.Second):
break
}
// check message // check message
if rsp.Msg != "Hello John" { if rsp.Msg != "Hello John" {
t.Fatalf("unexpected response %s", rsp.Msg) t.Fatalf("unexpected response %s", rsp.Msg)