Fix comments. Add timeout to integration test; don't make travis run for 15 minutes any more.

2014-06-27 15:02:06 -07:00
parent 999ea50c2a
commit 9a0f89170e
3 changed files with 33 additions and 16 deletions
--- a/cmd/integration/integration.go
+++ b/cmd/integration/integration.go
@@ -41,6 +41,12 @@ func main() {
 	util.InitLogs()
 	defer util.FlushLogs()

+	go func() {
+		defer util.FlushLogs()
+		time.Sleep(3 * time.Minute)
+		glog.Fatalf("This test has timed out.")
+	}()
+
 	manifestUrl := ServeCachedManifestFile()
 	// Setup
 	servers := []string{"http://localhost:4001"}