From 4977189c1b0eed0573a40e5cd2270e4ccee8fa16 Mon Sep 17 00:00:00 2001
From: Tom Wieczorek <twieczorek@mirantis.com>
Date: Fri, 9 Jun 2023 09:34:05 +0200
Subject: [PATCH] Fix ginkgo noColor deprecation warning

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.
---
 test/conformance/image/go-runner/cmd.go      |  2 +-
 test/conformance/image/go-runner/cmd_test.go | 12 ++++++------
 test/conformance/image/run_e2e.sh            |  2 +-
 test/e2e/windows/README.md                   |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/conformance/image/go-runner/cmd.go b/test/conformance/image/go-runner/cmd.go
index 7bba703b278..6339ad32949 100644
--- a/test/conformance/image/go-runner/cmd.go
+++ b/test/conformance/image/go-runner/cmd.go
@@ -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{
diff --git a/test/conformance/image/go-runner/cmd_test.go b/test/conformance/image/go-runner/cmd_test.go
index 942ce2a4880..b7b22e23ca1 100644
--- a/test/conformance/image/go-runner/cmd_test.go
+++ b/test/conformance/image/go-runner/cmd_test.go
@@ -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=",
 			},
diff --git a/test/conformance/image/run_e2e.sh b/test/conformance/image/run_e2e.sh
index 45569eb075e..0496b19fec8 100755
--- a/test/conformance/image/run_e2e.sh
+++ b/test/conformance/image/run_e2e.sh
@@ -67,7 +67,7 @@ esac
 ginkgo_args+=(
     "--focus=${E2E_FOCUS}"
     "--skip=${E2E_SKIP}"
-    "--noColor=true"
+    "--no-color=true"
 )
 
 set -x
diff --git a/test/e2e/windows/README.md b/test/e2e/windows/README.md
index 699a3aedc01..0bcc836e74c 100644
--- a/test/e2e/windows/README.md
+++ b/test/e2e/windows/README.md
@@ -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"
     ```