github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14802 from brendandburns/fix2

Browse Source 
Extend the timeout for the total integration test.
This commit is contained in:
Brendan Burns
2015-09-30 11:24:25 -07:00
parent 08bd00d14b 7328301cf3
commit 3337093e8c
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/integration/integration.go
View File

@@ -75,6 +75,8 @@ var (
maxConcurrency int maxConcurrency int
longTestTimeout = time.Second * 300 longTestTimeout = time.Second * 300
maxTestTimeout = time.Minute * 10
) )
type fakeKubeletClient struct{} type fakeKubeletClient struct{}
@@ -265,6 +267,7 @@ func startComponents(firstManifestURL, secondManifestURL string) (string, string
10*time.Second, /* MinimumGCAge */ 10*time.Second, /* MinimumGCAge */
3*time.Second, /* NodeStatusUpdateFrequency */ 3*time.Second, /* NodeStatusUpdateFrequency */
10*time.Second, /* SyncFrequency */ 10*time.Second, /* SyncFrequency */
40 /* MaxPods */) 40 /* MaxPods */)
kubeletapp.RunKubelet(kcfg, nil) kubeletapp.RunKubelet(kcfg, nil)
@@ -963,7 +966,7 @@ func main() {
go func() { go func() {
defer util.FlushLogs() defer util.FlushLogs()
time.Sleep(3 * time.Minute) time.Sleep(maxTestTimeout)
glog.Fatalf("This test has timed out.") glog.Fatalf("This test has timed out.")
}() }()