From ad7cbac16354e19981e986bbc2b3fd9cfa930d45 Mon Sep 17 00:00:00 2001 From: Masashi Honma Date: Wed, 14 Oct 2020 10:00:08 +0900 Subject: [PATCH] test: Fix deprecated --dry-run parameter Some unit tests throw this warning. W1013 09:06:21.581870 176998 helpers.go:567] --dry-run=true is deprecated (boolean value) and can be replaced with --dry-run=client. This patch removes the warning by using --dry-run=client instead of --dry-run=true. The unit tests that are affected are: make test WHAT=./vendor/k8s.io/kubectl/pkg/cmd/apply GOFLAGS=-v make test WHAT=./vendor/k8s.io/kubectl/pkg/cmd/create GOFLAGS=-v Signed-off-by: Masashi Honma --- staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go | 2 +- .../k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go | 2 +- staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go index 1d199ebfcc2..194fbe17696 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/apply/apply_test.go @@ -314,7 +314,7 @@ func TestRunApplyPrintsValidObjectList(t *testing.T) { cmd := NewCmdApply("kubectl", tf, ioStreams) cmd.Flags().Set("filename", filenameCM) cmd.Flags().Set("output", "json") - cmd.Flags().Set("dry-run", "true") + cmd.Flags().Set("dry-run", "client") cmd.Run(cmd, []string{}) // ensure that returned list can be unmarshaled back into a configmap list diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go index 0bc316b0f73..cc969d57e49 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_clusterrole_test.go @@ -151,7 +151,7 @@ func TestCreateClusterRole(t *testing.T) { for name, test := range tests { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreateClusterRole(tf, ioStreams) - cmd.Flags().Set("dry-run", "true") + cmd.Flags().Set("dry-run", "client") cmd.Flags().Set("output", "yaml") cmd.Flags().Set("verb", test.verbs) cmd.Flags().Set("resource", test.resources) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go index 912b559ff13..bcb9bc00c06 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_pdb_test.go @@ -55,7 +55,7 @@ func TestCreatePdb(t *testing.T) { cmd := NewCmdCreatePodDisruptionBudget(tf, ioStreams) cmd.Flags().Set("min-available", "1") cmd.Flags().Set("selector", "app=rails") - cmd.Flags().Set("dry-run", "true") + cmd.Flags().Set("dry-run", "client") cmd.Flags().Set("output", outputFormat) printFlags := genericclioptions.NewPrintFlags("created").WithTypeSetter(scheme.Scheme) diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go index fd85d19c307..2c1311cd77b 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_priorityclass_test.go @@ -56,7 +56,7 @@ func TestCreatePriorityClass(t *testing.T) { cmd.Flags().Set("value", "1000") cmd.Flags().Set("global-default", "true") cmd.Flags().Set("description", "my priority") - cmd.Flags().Set("dry-run", "true") + cmd.Flags().Set("dry-run", "client") cmd.Flags().Set("output", outputFormat) cmd.Flags().Set("preemption-policy", "Never") diff --git a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go index 0ccf461d835..8ed5b71f807 100644 --- a/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go +++ b/staging/src/k8s.io/kubectl/pkg/cmd/create/create_role_test.go @@ -134,7 +134,7 @@ func TestCreateRole(t *testing.T) { t.Run(name, func(t *testing.T) { ioStreams, _, buf, _ := genericclioptions.NewTestIOStreams() cmd := NewCmdCreateRole(tf, ioStreams) - cmd.Flags().Set("dry-run", "true") + cmd.Flags().Set("dry-run", "client") cmd.Flags().Set("output", "yaml") cmd.Flags().Set("verb", test.verbs) cmd.Flags().Set("resource", test.resources)