mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-28 05:57:25 +00:00
Remove timeout from cmd/e2e now that all tests are under it
This commit is contained in:
parent
5de4c49792
commit
9261c5a655
@ -20,7 +20,6 @@ import (
|
|||||||
"path"
|
"path"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
|
||||||
"github.com/golang/glog"
|
"github.com/golang/glog"
|
||||||
@ -48,17 +47,6 @@ func RunE2ETests(authConfig, certDir, host, repoRoot, provider string, orderseed
|
|||||||
util.InitLogs()
|
util.InitLogs()
|
||||||
defer util.FlushLogs()
|
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 len(testList) != 0 {
|
||||||
if config.GinkgoConfig.FocusString != "" || config.GinkgoConfig.SkipString != "" {
|
if config.GinkgoConfig.FocusString != "" || config.GinkgoConfig.SkipString != "" {
|
||||||
glog.Fatal("Either specify --test/-t or --ginkgo.focus/--ginkgo.skip but not both.")
|
glog.Fatal("Either specify --test/-t or --ginkgo.focus/--ginkgo.skip but not both.")
|
||||||
|
Loading…
Reference in New Issue
Block a user