Merge pull request kubernetes#129999 from pohly/test-e2e-node-timeout

k8s-ci-robot · web-flow · commit 491a23f0793a · 2025-02-06T03:59:55.000-08:00
E2E node: fix --timeout default
diff --git a/test/e2e_node/remote/remote.go b/test/e2e_node/remote/remote.go
@@ -154,7 +154,7 @@ func RunRemote(cfg RunRemoteConfig) (string, bool, error) {
 	}
 
 	allGinkgoFlags := cfg.GinkgoArgs
-	if !strings.Contains(allGinkgoFlags, "--timeout") {
+	if !strings.Contains(allGinkgoFlags, "-timeout") {
 		klog.Warningf("ginkgo flags are missing explicit --timeout (ginkgo defaults to 60 minutes)")
 		// see https://github.com/onsi/ginkgo/blob/master/docs/index.md#:~:text=ginkgo%20%2D%2Dtimeout%3Dduration
 		// ginkgo suite timeout should be more than the default but less than the

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func RunRemote(cfg RunRemoteConfig) (string, bool, error) {`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`allGinkgoFlags := cfg.GinkgoArgs`
`157`		`- if !strings.Contains(allGinkgoFlags, "--timeout") {`
	`157`	`+ if !strings.Contains(allGinkgoFlags, "-timeout") {`
`158`	`158`	`klog.Warningf("ginkgo flags are missing explicit --timeout (ginkgo defaults to 60 minutes)")`
`159`	`159`	`// see https://github.com/onsi/ginkgo/blob/master/docs/index.md#:~:text=ginkgo%20%2D%2Dtimeout%3Dduration`
`160`	`160`	`// ginkgo suite timeout should be more than the default but less than the`