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

Merge pull request #118585 from twz123/fix-ginkgo-no-color-deprecation-warning

Browse Source 
Fix ginkgo noColor deprecation warning
This commit is contained in:
Kubernetes Prow Robot
2023-06-15 11:22:18 -07:00
committed by GitHub
parent 1193ab62e2 4977189c1b
commit 79ca192b4f
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
test/conformance/image/go-runner/cmd.go
View File

@@ -42,7 +42,7 @@ func getCmd(env Getenver, w io.Writer) *exec.Cmd {
ginkgoArgs = append(ginkgoArgs, []string{
"--focus=" + env.Getenv(focusEnvKey),
"--skip=" + skip,
"--noColor=true",
"--no-color=true",
}...)
extraArgs := []string{

12
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", "--timeout=24h", "testbin", "--",
"--no-color=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", "--timeout=24h", "testbin", "--",
"--no-color=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", "--timeout=24h", "testbin", "--",
"--no-color=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", "--timeout=24h",
"--no-color=true", "--ginkgo1", "--ginkgo2", "--timeout=24h",
"testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
@@ -110,7 +110,7 @@ func TestGetCmd(t *testing.T) {
},
expectArgs: []string{
"ginkgobin", "--focus=", "--skip=",
"--noColor=true", `--ginkgo='with "quotes" and '`, "--ginkgo2=true$(foo)", "--timeout=24h",
"--no-color=true", `--ginkgo='with "quotes" and '`, "--ginkgo2=true$(foo)", "--timeout=24h",
"testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
@@ -127,7 +127,7 @@ func TestGetCmd(t *testing.T) {
},
expectArgs: []string{
"ginkgobin", "--focus=", "--skip=",
"--noColor=true", "--timeout=10h", "testbin", "--",
"--no-color=true", "--timeout=10h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=",
},

2
test/conformance/image/run_e2e.sh
View File

@@ -67,7 +67,7 @@ esac
ginkgo_args+=(
"--focus=${E2E_FOCUS}"
"--skip=${E2E_SKIP}"
"--noColor=true"
"--no-color=true"
)
set -x

2
test/e2e/windows/README.md
View File

@@ -11,7 +11,7 @@ export KUBE_TEST_REPO_LIST=$(pwd)/repo_list
1. Run only sig-windows tests:
```bash
./e2e.test --provider=local --ginkgo.noColor --ginkgo.focus="\[sig-windows\]|\[Feature:Windows\]" --node-os-distro="windows"
./e2e.test --provider=local --ginkgo.no-color --ginkgo.focus="\[sig-windows\]|\[Feature:Windows\]" --node-os-distro="windows"
```