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

Merge pull request #1031 from alrs/fix-web-test-goroutines

Browse Source 
web: fix test goroutines
This commit is contained in:
Asim Aslam 2019-12-09 18:03:07 +00:00 committed by GitHub
commit 7d884eff9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
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) {
@ -221,10 +242,10 @@ func TestTLS(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
@ -257,4 +278,14 @@ func TestTLS(t *testing.T) {
if string(b) != str { if string(b) != str {
t.Errorf("Expected %s got %s", str, string(b)) t.Errorf("Expected %s got %s", str, string(b))
} }
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")
}
} }