close_issue_2
/
tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmd/godoc: wait up to 500ms for results of -analysis=type. 

(The test thread is racing with the analysis thread, which
takes around 4ms on this input.)

LGTM=gri
R=gri, bradfitz
CC=golang-codereviews
https://golang.org/cl/89780044
This commit is contained in:
Alan Donovan 2014-04-21 17:56:06 -04:00
parent feafa74756
commit 4a9f74ad65
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cmd/godoc/godoc_test.go
View File

@ -225,9 +225,12 @@ func main() { print(lib.V) }
defer cmd.Process.Kill() defer cmd.Process.Kill()
waitForServer(t, addr) waitForServer(t, addr)
t0 := time.Now()
// Make an HTTP request and check for a regular expression match. // Make an HTTP request and check for a regular expression match.
// The patterns are very crude checks that basic type information // The patterns are very crude checks that basic type information
// has been annotated onto the source view. // has been annotated onto the source view.
tryagain:
for _, test := range []struct{ url, pattern string }{ for _, test := range []struct{ url, pattern string }{
{"/src/pkg/lib/lib.go", "L2.*package .*Package docs for lib.*/pkg/lib"}, {"/src/pkg/lib/lib.go", "L2.*package .*Package docs for lib.*/pkg/lib"},
{"/src/pkg/lib/lib.go", "L3.*type .*type info for T.*struct"}, {"/src/pkg/lib/lib.go", "L3.*type .*type info for T.*struct"},
@ -250,6 +253,17 @@ func main() { print(lib.V) }
t.Errorf("GET %s: failed to read body: %s (response: %v)", url, err, resp) t.Errorf("GET %s: failed to read body: %s (response: %v)", url, err, resp)
continue continue
} }
if !bytes.Contains(body, []byte("Static analysis features")) {
// Type analysis results usually become available within
// ~4ms after godoc startup (for this input on my machine).
if elapsed := time.Since(t0); elapsed > 500*time.Millisecond {
t.Fatalf("type analysis results still unavailable after %s", elapsed)
}
time.Sleep(10 * time.Millisecond)
goto tryagain
}
match, err := regexp.Match(test.pattern, body) match, err := regexp.Match(test.pattern, body)
if err != nil { if err != nil {
t.Errorf("regexp.Match(%q) failed: %s", test.pattern, err) t.Errorf("regexp.Match(%q) failed: %s", test.pattern, err)