Merge pull request #104761 from lauchokyip/improveCM

Improve create configmap test

Kubernetes-commit: ff593c89a0c8c46e37fca168e05d4fa09d15f353

go.mod

@@ -39,7 +39,7 @@ require (
 	k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4
 	k8s.io/klog/v2 v2.20.0
 	k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8
-	k8s.io/metrics v0.0.0-20210917125721-7746c9beebab
+	k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b
 	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
 	sigs.k8s.io/kustomize/kustomize/v4 v4.2.0
 	sigs.k8s.io/kustomize/kyaml v0.11.0
@@ -54,5 +54,5 @@ replace (
 	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210917113608-df0a6b4dbccd
 	k8s.io/component-base => k8s.io/component-base v0.0.0-20210917120930-d2872948dda4
 	k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20210917121340-877e28014df4
-	k8s.io/metrics => k8s.io/metrics v0.0.0-20210917125721-7746c9beebab
+	k8s.io/metrics => k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b
 )

go.sum

@@ -924,8 +924,8 @@ k8s.io/klog/v2 v2.20.0/go.mod h1:Gm8eSIfQN6457haJuPaMxZw4wyP5k+ykPFlrhQDvhvw=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8 h1:Xxl9TLJ30BJ1pGWfGZnqbpww2rwOt3RAzbSz+omQGtg=
 k8s.io/kube-openapi v0.0.0-20210817084001-7fbd8d59e5b8/go.mod h1:foAE7XkrXQ1Qo2eWsW/iWksptrVdbl6t+vscSdmmGjk=
-k8s.io/metrics v0.0.0-20210917125721-7746c9beebab h1:RLwMMC24ew1F8IdCsNVjQg8QmhBcLKzHRSBHqI1cLFw=
+k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b h1:tPMI7592vARyywYIIxuM6X6JstiJ8oA334CkylWGK7Q=
-k8s.io/metrics v0.0.0-20210917125721-7746c9beebab/go.mod h1:BEIBRQJLeWBgECpYDV2BlR5iTFEn7JuqJ3Jtn74LusU=
+k8s.io/metrics v0.0.0-20210917125722-7754d83b5e6b/go.mod h1:BEIBRQJLeWBgECpYDV2BlR5iTFEn7JuqJ3Jtn74LusU=
 k8s.io/utils v0.0.0-20210802155522-efc7438f0176/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=

pkg/cmd/create/create_configmap_test.go

@@ -21,6 +21,8 @@ import (
 	"os"
 	"testing"
 
+	"github.com/stretchr/testify/require"
+
 	corev1 "k8s.io/api/core/v1"
 	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -441,21 +443,18 @@ func TestCreateConfigMap(t *testing.T) {
 				}
 			}
 			err := configMapOptions.Validate()
+
 			if err == nil {
 				configMap, err = configMapOptions.createConfigMap()
 			}
-
+			if test.expectErr == "" {
-			if test.expectErr == "" && err != nil {
+				require.NoError(t, err)
-				t.Errorf("unexpected error: %v", err)
+				if !apiequality.Semantic.DeepEqual(configMap, test.expected) {
-			}
+					t.Errorf("\nexpected:\n%#v\ngot:\n%#v", test.expected, configMap)
-			if test.expectErr != "" && err == nil {
+				}
-				t.Errorf("was expecting an error but no error occurred")
+			} else {
-			}
+				require.Error(t, err)
-			if test.expectErr != "" && test.expectErr != err.Error() {
+				require.EqualError(t, err, test.expectErr)
-				t.Errorf("\nexpected error:\n%s\ngot error:\n%s", test.expectErr, err.Error())
-			}
-			if !apiequality.Semantic.DeepEqual(configMap, test.expected) {
-				t.Errorf("\nexpected:\n%#v\ngot:\n%#v", test.expected, configMap)
 			}
 		})
 	}