Merge pull request kubernetes#72433 from bart0sh/PR0050-kubeadm-app-util-use-T.Run

kubeadm: use T.Run API in app/util

Author: k8s-ci-robot

cmd/kubeadm/app/util/apiclient/dryrunclient_test.go

@@ -29,28 +29,33 @@ import (
 
 func TestLogDryRunAction(t *testing.T) {
 	var tests = []struct {
+		name          string
 		action        core.Action
 		expectedBytes []byte
 		buf           *bytes.Buffer
 	}{
 		{
+			name:   "action GET on services",
 			action: core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, "default", "kubernetes"),
 			expectedBytes: []byte(`[dryrun] Would perform action GET on resource "services" in API group "core/v1"
 [dryrun] Resource name: "kubernetes"
 `),
 		},
 		{
+			name:   "action GET on clusterrolebindings",
 			action: core.NewRootGetAction(schema.GroupVersionResource{Group: rbac.GroupName, Version: rbac.SchemeGroupVersion.Version, Resource: "clusterrolebindings"}, "system:node"),
 			expectedBytes: []byte(`[dryrun] Would perform action GET on resource "clusterrolebindings" in API group "rbac.authorization.k8s.io/v1"
 [dryrun] Resource name: "system:node"
 `),
 		},
 		{
+			name:   "action LIST on services",
 			action: core.NewListAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, schema.GroupVersionKind{Version: "v1", Kind: "Service"}, "default", metav1.ListOptions{}),
 			expectedBytes: []byte(`[dryrun] Would perform action LIST on resource "services" in API group "core/v1"
 `),
 		},
 		{
+			name: "action CREATE on services",
 			action: core.NewCreateAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, "default", &v1.Service{
 				ObjectMeta: metav1.ObjectMeta{
 					Name: "foo",
@@ -72,6 +77,7 @@ func TestLogDryRunAction(t *testing.T) {
 `),
 		},
 		{
+			name:   "action PATCH on nodes",
 			action: core.NewPatchAction(schema.GroupVersionResource{Version: "v1", Resource: "nodes"}, "default", "my-node", "application/strategic-merge-patch+json", []byte(`{"spec":{"taints":[{"key": "foo", "value": "bar"}]}}`)),
 			expectedBytes: []byte(`[dryrun] Would perform action PATCH on resource "nodes" in API group "core/v1"
 [dryrun] Resource name: "my-node"
@@ -80,23 +86,26 @@ func TestLogDryRunAction(t *testing.T) {
 `),
 		},
 		{
+			name:   "action DELETE on pods",
 			action: core.NewDeleteAction(schema.GroupVersionResource{Version: "v1", Resource: "pods"}, "default", "my-pod"),
 			expectedBytes: []byte(`[dryrun] Would perform action DELETE on resource "pods" in API group "core/v1"
 [dryrun] Resource name: "my-pod"
 `),
 		},
 	}
 	for _, rt := range tests {
-		rt.buf = bytes.NewBufferString("")
-		logDryRunAction(rt.action, rt.buf, DefaultMarshalFunc)
-		actualBytes := rt.buf.Bytes()
+		t.Run(rt.name, func(t *testing.T) {
+			rt.buf = bytes.NewBufferString("")
+			logDryRunAction(rt.action, rt.buf, DefaultMarshalFunc)
+			actualBytes := rt.buf.Bytes()
 
-		if !bytes.Equal(actualBytes, rt.expectedBytes) {
-			t.Errorf(
-				"failed LogDryRunAction:\n\texpected bytes: %q\n\t  actual: %q",
-				rt.expectedBytes,
-				actualBytes,
-			)
-		}
+			if !bytes.Equal(actualBytes, rt.expectedBytes) {
+				t.Errorf(
+					"failed LogDryRunAction:\n\texpected bytes: %q\n\t  actual: %q",
+					rt.expectedBytes,
+					actualBytes,
+				)
+			}
+		})
 	}
 }

cmd/kubeadm/app/util/apiclient/init_dryrun_test.go

@@ -32,95 +32,106 @@ func TestHandleGetAction(t *testing.T) {
 	idr := NewInitDryRunGetter(masterName, serviceSubnet)
 
 	var tests = []struct {
+		name               string
 		action             core.GetActionImpl
 		expectedHandled    bool
 		expectedObjectJSON []byte
 		expectedErr        bool
 	}{
 		{
+			name:               "get default services",
 			action:             core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, "default", "kubernetes"),
 			expectedHandled:    true,
 			expectedObjectJSON: []byte(`{"metadata":{"name":"kubernetes","namespace":"default","creationTimestamp":null,"labels":{"component":"apiserver","provider":"kubernetes"}},"spec":{"ports":[{"name":"https","port":443,"targetPort":6443}],"clusterIP":"10.96.0.1"},"status":{"loadBalancer":{}}}`),
 			expectedErr:        false,
 		},
 		{
+			name:               "get nodes",
 			action:             core.NewRootGetAction(schema.GroupVersionResource{Version: "v1", Resource: "nodes"}, masterName),
 			expectedHandled:    true,
 			expectedObjectJSON: []byte(`{"metadata":{"name":"master-foo","creationTimestamp":null,"labels":{"kubernetes.io/hostname":"master-foo"}},"spec":{},"status":{"daemonEndpoints":{"kubeletEndpoint":{"Port":0}},"nodeInfo":{"machineID":"","systemUUID":"","bootID":"","kernelVersion":"","osImage":"","containerRuntimeVersion":"","kubeletVersion":"","kubeProxyVersion":"","operatingSystem":"","architecture":""}}}`),
 			expectedErr:        false,
 		},
 		{
+			name:               "get clusterrolebinings",
 			action:             core.NewRootGetAction(schema.GroupVersionResource{Group: rbac.GroupName, Version: rbac.SchemeGroupVersion.Version, Resource: "clusterrolebindings"}, "system:node"),
 			expectedHandled:    true,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        true, // we expect a NotFound error here
 		},
 		{
+			name:               "get kube-system secret bootstrap-token-abcdef",
 			action:             core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, "kube-system", "bootstrap-token-abcdef"),
 			expectedHandled:    true,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        true, // we expect a NotFound error here
 		},
 		{ // an ask for a kubernetes service in the _kube-system_ ns should not be answered
+			name:               "get kube-system services",
 			action:             core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, "kube-system", "kubernetes"),
 			expectedHandled:    false,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        false,
 		},
 		{ // an ask for an other service than kubernetes should not be answered
+			name:               "get default my-other-service",
 			action:             core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "services"}, "default", "my-other-service"),
 			expectedHandled:    false,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        false,
 		},
 		{ // an ask for an other node than the master should not be answered
+			name:               "get other-node",
 			action:             core.NewRootGetAction(schema.GroupVersionResource{Version: "v1", Resource: "nodes"}, "other-node"),
 			expectedHandled:    false,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        false,
 		},
 		{ // an ask for a secret in any other ns than kube-system should not be answered
+			name:               "get default secret bootstrap-token-abcdef",
 			action:             core.NewGetAction(schema.GroupVersionResource{Version: "v1", Resource: "secrets"}, "default", "bootstrap-token-abcdef"),
 			expectedHandled:    false,
 			expectedObjectJSON: []byte(``),
 			expectedErr:        false,
 		},
 	}
 	for _, rt := range tests {
-		handled, obj, actualErr := idr.HandleGetAction(rt.action)
-		objBytes := []byte(``)
-		if obj != nil {
-			var err error
-			objBytes, err = json.Marshal(obj)
-			if err != nil {
-				t.Fatalf("couldn't marshal returned object")
+		t.Run(rt.name, func(t *testing.T) {
+			handled, obj, actualErr := idr.HandleGetAction(rt.action)
+			objBytes := []byte(``)
+			if obj != nil {
+				var err error
+				objBytes, err = json.Marshal(obj)
+				if err != nil {
+					t.Fatalf("couldn't marshal returned object")
+				}
 			}
-		}
 
-		if handled != rt.expectedHandled {
-			t.Errorf(
-				"failed HandleGetAction:\n\texpected handled: %t\n\t  actual: %t %v",
-				rt.expectedHandled,
-				handled,
-				rt.action,
-			)
-		}
+			if handled != rt.expectedHandled {
+				t.Errorf(
+					"failed HandleGetAction:\n\texpected handled: %t\n\t  actual: %t %v",
+					rt.expectedHandled,
+					handled,
+					rt.action,
+				)
+			}
 
-		if !bytes.Equal(objBytes, rt.expectedObjectJSON) {
-			t.Errorf(
-				"failed HandleGetAction:\n\texpected object: %q\n\t  actual: %q",
-				rt.expectedObjectJSON,
-				objBytes,
-			)
-		}
+			if !bytes.Equal(objBytes, rt.expectedObjectJSON) {
+				t.Errorf(
+					"failed HandleGetAction:\n\texpected object: %q\n\t  actual: %q",
+					rt.expectedObjectJSON,
+					objBytes,
+				)
+			}
 
-		if (actualErr != nil) != rt.expectedErr {
-			t.Errorf(
-				"failed HandleGetAction:\n\texpected error: %t\n\t  actual: %t %v",
-				rt.expectedErr,
-				(actualErr != nil),
-				rt.action,
-			)
-		}
+			if (actualErr != nil) != rt.expectedErr {
+				t.Errorf(
+					"failed HandleGetAction:\n\texpected error: %t\n\t  actual: %t %v",
+					rt.expectedErr,
+					(actualErr != nil),
+					rt.action,
+				)
+			}
+		})
 	}
 }