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

Merge pull request #126055 from dims/set-ginkgo-timeout-if-not-specified-explicitly

Browse Source 
Set ginkgo time if not specified explicitly
This commit is contained in:
Kubernetes Prow Robot
2024-07-12 12:50:34 -07:00
committed by GitHub
parent 68da9a6762 2db4c4aaab
commit 9c653b8837
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/e2e_node/remote/remote.go
View File

@@ -153,9 +153,21 @@ func RunRemote(cfg RunRemoteConfig) (string, bool, error) {
return "", false, fmt.Errorf("failed to create test result directory %q on Host %q: %v Output: %q", resultDir, cfg.Host, err, output) return "", false, fmt.Errorf("failed to create test result directory %q on Host %q: %v Output: %q", resultDir, cfg.Host, err, output)
} }
allGinkgoFlags := cfg.GinkgoArgs
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
// full test timeout, so we should use the average of the two.
suiteTimeout := int(testTimeout.Minutes())
suiteTimeout = (60 + suiteTimeout) / 2
allGinkgoFlags = fmt.Sprintf("%s --timeout=%dm", allGinkgoFlags, suiteTimeout)
klog.Infof("updated ginkgo flags: %s", allGinkgoFlags)
}
klog.V(2).Infof("Running test on %q", cfg.Host) klog.V(2).Infof("Running test on %q", cfg.Host)
output, err := cfg.Suite.RunTest(cfg.Host, workspace, resultDir, cfg.ImageDesc, cfg.JunitFileName, cfg.TestArgs, output, err := cfg.Suite.RunTest(cfg.Host, workspace, resultDir, cfg.ImageDesc, cfg.JunitFileName, cfg.TestArgs,
cfg.GinkgoArgs, cfg.SystemSpecName, cfg.ExtraEnvs, cfg.RuntimeConfig, *testTimeout) allGinkgoFlags, cfg.SystemSpecName, cfg.ExtraEnvs, cfg.RuntimeConfig, *testTimeout)
var aggErrs []error var aggErrs []error
// Do not log the Output here, let the caller deal with the test Output. // Do not log the Output here, let the caller deal with the test Output.