github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-09 12:07:47 +00:00
Code Issues Projects Releases Wiki Activity

Fix ginkgo noColor deprecation warning

Browse Source 
Ginkgo changed the noColor command line arg to be no-color and will
issue the following warning:

You're using deprecated Ginkgo functionality:
=============================================
  --noColor is deprecated, use --no-color instead

Fix this by changing all occurrences accordingly.
This commit is contained in:
Tom Wieczorek 2023-06-09 09:34:05 +02:00
parent d93e1e95ff
commit 4977189c1b
No known key found for this signature in database
GPG Key ID: FE33A2282371E831
4 changed files with 9 additions and 9 deletions
Show Stats 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{ ginkgoArgs = append(ginkgoArgs, []string{
"--focus=" + env.Getenv(focusEnvKey), "--focus=" + env.Getenv(focusEnvKey),
"--skip=" + skip, "--skip=" + skip,
"--noColor=true", "--no-color=true",
}...) }...)
extraArgs := []string{ extraArgs := []string{

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

@ -39,7 +39,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "ginkgobin",
"--focus=", "--skip=", "--focus=", "--skip=",
"--noColor=true", "--timeout=24h", "testbin", "--", "--no-color=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=", "--provider=", "--report-dir=", "--kubeconfig=",
}, },
@ -59,7 +59,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "ginkgobin",
"--focus=focus", "--skip=skip", "--focus=focus", "--skip=skip",
"--noColor=true", "--timeout=24h", "testbin", "--", "--no-color=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=provider", "--report-dir=results", "--kubeconfig=kubeconfig", "--provider=provider", "--report-dir=results", "--kubeconfig=kubeconfig",
}, },
@ -75,7 +75,7 @@ func TestGetCmd(t *testing.T) {
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "--p", "ginkgobin", "--p",
"--focus=", "--skip=\\[Serial\\]", "--focus=", "--skip=\\[Serial\\]",
"--noColor=true", "--timeout=24h", "testbin", "--", "--no-color=true", "--timeout=24h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=", "--provider=", "--report-dir=", "--kubeconfig=",
}, },
@ -91,7 +91,7 @@ func TestGetCmd(t *testing.T) {
}, },
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "--focus=", "--skip=", "ginkgobin", "--focus=", "--skip=",
"--noColor=true", "--ginkgo1", "--ginkgo2", "--timeout=24h", "--no-color=true", "--ginkgo1", "--ginkgo2", "--timeout=24h",
"testbin", "--", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=", "--provider=", "--report-dir=", "--kubeconfig=",
@ -110,7 +110,7 @@ func TestGetCmd(t *testing.T) {
}, },
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "--focus=", "--skip=", "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", "--", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=", "--provider=", "--report-dir=", "--kubeconfig=",
@ -127,7 +127,7 @@ func TestGetCmd(t *testing.T) {
}, },
expectArgs: []string{ expectArgs: []string{
"ginkgobin", "--focus=", "--skip=", "ginkgobin", "--focus=", "--skip=",
"--noColor=true", "--timeout=10h", "testbin", "--", "--no-color=true", "--timeout=10h", "testbin", "--",
"--disable-log-dump", "--repo-root=/kubernetes", "--disable-log-dump", "--repo-root=/kubernetes",
"--provider=", "--report-dir=", "--kubeconfig=", "--provider=", "--report-dir=", "--kubeconfig=",
}, },

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

@ -67,7 +67,7 @@ esac
ginkgo_args+=( ginkgo_args+=(
"--focus=${E2E_FOCUS}" "--focus=${E2E_FOCUS}"
"--skip=${E2E_SKIP}" "--skip=${E2E_SKIP}"
"--noColor=true" "--no-color=true"
) )
set -x 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: 1. Run only sig-windows tests:
```bash ```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"
``` ```