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

go.tools/cmd/godoc: wait for godoc to exit before removing tmp directory 

otherwise tmp directories do not get deleted on windows

LGTM=adg
R=golang-codereviews, adg
CC=golang-codereviews
https://golang.org/cl/166750043
This commit is contained in:
Alex Brainman 2014-10-28 16:59:58 +11:00
parent 30f7e63100
commit 4bb917e48d
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/godoc/godoc_test.go
View File

@ -140,6 +140,11 @@ func waitForServer(t *testing.T, address string) {
t.Fatalf("Server %q failed to respond in 5 seconds", address) t.Fatalf("Server %q failed to respond in 5 seconds", address)
} }
func killAndWait(cmd *exec.Cmd) {
cmd.Process.Kill()
cmd.Wait()
}
// Basic integration test for godoc HTTP interface. // Basic integration test for godoc HTTP interface.
func TestWeb(t *testing.T) { func TestWeb(t *testing.T) {
bin, cleanup := buildGodoc(t) bin, cleanup := buildGodoc(t)
@ -152,7 +157,7 @@ func TestWeb(t *testing.T) {
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
t.Fatalf("failed to start godoc: %s", err) t.Fatalf("failed to start godoc: %s", err)
} }
defer cmd.Process.Kill() defer killAndWait(cmd)
waitForServer(t, addr) waitForServer(t, addr)
tests := []struct { tests := []struct {
path string path string
@ -282,7 +287,7 @@ func main() { print(lib.V) }
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
t.Fatalf("failed to start godoc: %s", err) t.Fatalf("failed to start godoc: %s", err)
} }
defer cmd.Process.Kill() defer killAndWait(cmd)
waitForServer(t, addr) waitForServer(t, addr)
// Wait for type analysis to complete. // Wait for type analysis to complete.