unistack-org/micro
4
0
Fork 3
Code Issues 19 Pull Requests 1 Actions Packages Projects Releases 259 Wiki Activity

web: fix test goroutine in TestService()

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

30
web/service_test.go
View File

@ -57,10 +57,10 @@ func TestService(t *testing.T) {
service.HandleFunc("/", fn) service.HandleFunc("/", fn)
errCh := make(chan error, 1)
go func() { go func() {
if err := service.Run(); err != nil { errCh <- service.Run()
t.Fatal(err) close(errCh)
}
}() }()
var s []*registry.Service var s []*registry.Service
@ -104,12 +104,32 @@ func TestService(t *testing.T) {
} }
} }
select {
case err := <-errCh:
if err != nil {
t.Fatalf("service.Run():%v", err)
}
case <-time.After(time.Duration(time.Second)):
t.Logf("service.Run() survived a client request without an error")
}
ch := make(chan os.Signal, 1) ch := make(chan os.Signal, 1)
signal.Notify(ch, syscall.SIGTERM) signal.Notify(ch, syscall.SIGTERM)
syscall.Kill(syscall.Getpid(), syscall.SIGTERM) syscall.Kill(syscall.Getpid(), syscall.SIGTERM)
<-ch <-ch
select {
case err := <-errCh:
if err != nil {
t.Fatalf("service.Run():%v", err)
} else {
t.Log("service.Run() nil return on syscall.SIGTERM")
}
case <-time.After(time.Duration(time.Second)):
t.Logf("service.Run() survived a client request without an error")
}
eventually(func() bool { eventually(func() bool {
_, err := reg.GetService("go.micro.web.test") _, err := reg.GetService("go.micro.web.test")
return err == registry.ErrNotFound return err == registry.ErrNotFound
@ -128,6 +148,7 @@ func TestService(t *testing.T) {
t.Errorf("unexpected %s: want true, have false", tt.subject) t.Errorf("unexpected %s: want true, have false", tt.subject)
} }
} }
} }
func TestOptions(t *testing.T) { func TestOptions(t *testing.T) {
@ -261,9 +282,10 @@ func TestTLS(t *testing.T) {
select { select {
case err := <-errCh: case err := <-errCh:
if err != nil { if err != nil {
t.Fatalf("Run():%v", err) t.Fatalf("service.Run():%v", err)
} }
case <-time.After(time.Duration(time.Second)): case <-time.After(time.Duration(time.Second)):
t.Logf("service.Run() survived a client request without an error") t.Logf("service.Run() survived a client request without an error")
} }
} }