scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-27 03:44:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Define the timeout to 24h for Ginkgo V2

Browse Source 
Default timeout setting has been reduced from `24h` down to `1h` in
Ginkgo V2, but for some long running test this is too short.

How long to abort the test was controlled by the the linux command `timeout`
in V1. e.g. `'timeout -k 30s 150m ...`, and is configured in the file
like `sig-network-misc.yaml`.

Set the timeout manually for Ginkgo V2 to avoid the early aborting.

Signed-off-by: Dave Chen <dave.chen@arm.com>
This commit is contained in:
Dave Chen
2022-04-20 18:00:49 +08:00
parent 2084f3cef2
commit 2f3028c00d
4 changed files with 41 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
test/conformance/image/go-runner/cmd_test.go
View File

@@ -39,7 +39,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{
"ginkgobin",
"--focus=", "--skip=",
"--noColor=true", "testbin", "--",
"--noColor=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
},
@@ -59,7 +59,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{
"ginkgobin",
"--focus=focus", "--skip=skip",
"--noColor=true", "testbin", "--",
"--noColor=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=provider", "--report-dir=results", "--kubeconfig=kubeconfig",
},
@@ -75,7 +75,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{
"ginkgobin", "--p",
"--focus=", "--skip=\\[Serial\\]",
"--noColor=true", "testbin", "--",
"--noColor=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
},
@@ -91,7 +91,7 @@ func TestGetCmd(t *testing.T) {
},
expectArgs: []string{
"ginkgobin", "--focus=", "--skip=",
"--noColor=true", "--ginkgo1", "--ginkgo2",
"--noColor=true", "--ginkgo1", "--ginkgo2", "--timeout=24h",
"testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
@@ -110,12 +110,27 @@ func TestGetCmd(t *testing.T) {
},
expectArgs: []string{
"ginkgobin", "--focus=", "--skip=",
"--noColor=true", `--ginkgo='with "quotes" and '`, "--ginkgo2=true$(foo)",
"--noColor=true", `--ginkgo='with "quotes" and '`, "--ginkgo2=true$(foo)", "--timeout=24h",
"testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
"--extra=value with spaces", "--extra=value with % anything!$$",
},
}, {
desc: "Set Ginkgo timeout in env",
env: &explicitEnv{
vals: map[string]string{
ginkgoEnvKey: "ginkgobin",
testBinEnvKey: "testbin",
extraGinkgoArgsEnvKey: "--timeout=10h",
},
},
expectArgs: []string{
"ginkgobin", "--focus=", "--skip=",
"--noColor=true", "--timeout=10h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
},
},
}
for _, tc := range testCases {