From 9261c5a6555f09822678ba69a66f0078b17a5488 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Thu, 5 Feb 2015 14:35:24 -0800 Subject: [PATCH] Remove timeout from cmd/e2e now that all tests are under it --- test/e2e/driver.go | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/test/e2e/driver.go b/test/e2e/driver.go index 7f2664f2ebb..95c4b84e0f8 100644 --- a/test/e2e/driver.go +++ b/test/e2e/driver.go @@ -20,7 +20,6 @@ import ( "path" "regexp" "strings" - "time" "github.com/GoogleCloudPlatform/kubernetes/pkg/util" "github.com/golang/glog" @@ -48,17 +47,6 @@ func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed util.InitLogs() defer util.FlushLogs() - // TODO: Associate a timeout with each test individually. - go func() { - defer util.FlushLogs() - // TODO: We should modify testSpec to include an estimated running time - // for each test and use that information to estimate a timeout - // value. Until then, as we add more tests (and before we move to - // parallel testing) we need to adjust this value as we add more tests. - time.Sleep(40 * time.Minute) - glog.Fatalf("This test has timed out. Cleanup not guaranteed.") - }() - if len(testList) != 0 { if config.GinkgoConfig.FocusString != "" || config.GinkgoConfig.SkipString != "" { glog.Fatal("Either specify --test/-t or --ginkgo.focus/--ginkgo.skip but not both.")