github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #4190 from zmerlynn/kill_e2e_timeout 

Remove timeout from cmd/e2e now that all tests are under it
pull/6/head
Brendan Burns 2015-02-05 14:45:17 -08:00
parent 5de4c49792 9261c5a655
commit 7a21bed3c7
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
test/e2e/driver.go
View File

@ -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.")