unistack-org/micro
4
0
Fork 3
Code Issues 20 Pull Requests 2 Actions Packages Projects Releases 288 Wiki Activity

Merge pull request #1035 from alrs/fix-grpc-test-goroutines

Browse Source 
Fix service/grpc Test Goroutines
This commit is contained in:
Asim Aslam 2019-12-11 16:39:22 +00:00 committed by GitHub
commit 631faff7b8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
service/grpc/grpc_test.go
View File

@ -5,6 +5,7 @@ import (
"crypto/tls"
"sync"
"testing"
"time"
"github.com/micro/go-micro"
"github.com/micro/go-micro/registry/memory"
@ -44,10 +45,10 @@ func TestGRPCService(t *testing.T) {
hello.RegisterTestHandler(service.Server(), &testHandler{})
// run service
errCh := make(chan error, 1)
go func() {
if err := service.Run(); err != nil {
t.Fatal(err)
}
defer close(errCh)
errCh <- service.Run()
}()
// wait for start
@ -57,13 +58,23 @@ func TestGRPCService(t *testing.T) {
test := hello.NewTestService("test.service", service.Client())
// 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",
})
if err != nil {
t.Fatal(err)
}
// check server
select {
case err := <-errCh:
t.Fatal(err)
case <-time.After(time.Second):
break
}
// check message
if rsp.Msg != "Hello John" {
t.Fatalf("unexpected response %s", rsp.Msg)
@ -151,10 +162,10 @@ func TestGRPCTLSService(t *testing.T) {
hello.RegisterTestHandler(service.Server(), &testHandler{})
// run service
errCh := make(chan error, 1)
go func() {
if err := service.Run(); err != nil {
t.Fatal(err)
}
defer close(errCh)
errCh <- service.Run()
}()
// wait for start
@ -164,13 +175,23 @@ func TestGRPCTLSService(t *testing.T) {
test := hello.NewTestService("test.service", service.Client())
// 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",
})
if err != nil {
t.Fatal(err)
}
// check server
select {
case err := <-errCh:
t.Fatal(err)
case <-time.After(time.Second):
break
}
// check message
if rsp.Msg != "Hello John" {
t.Fatalf("unexpected response %s", rsp.Msg)