From 945593d4deaf2d98442930b84b3d2f4711d65ffc Mon Sep 17 00:00:00 2001 From: Chao Xu Date: Fri, 9 Jun 2017 16:41:54 -0700 Subject: [PATCH] manually fix unit tests --- federation/pkg/kubefed/join_test.go | 11 ++++++----- pkg/api/v1/defaults_test.go | 20 ++++++++++---------- pkg/api/v1/helper/qos/qos_test.go | 5 +++-- pkg/apis/batch/v2alpha1/defaults_test.go | 12 ++++++------ 4 files changed, 25 insertions(+), 23 deletions(-) diff --git a/federation/pkg/kubefed/join_test.go b/federation/pkg/kubefed/join_test.go index 5b1149a53f6..200829826c2 100644 --- a/federation/pkg/kubefed/join_test.go +++ b/federation/pkg/kubefed/join_test.go @@ -24,6 +24,9 @@ import ( "os" "testing" + "k8s.io/api/core/v1" + "k8s.io/api/extensions/v1beta1" + rbacv1beta1 "k8s.io/api/rbac/v1beta1" apiequality "k8s.io/apimachinery/pkg/api/equality" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/diff" @@ -37,9 +40,7 @@ import ( "k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/testapi" - "k8s.io/api/core/v1" - "k8s.io/api/extensions/v1beta1" - rbacv1beta1 "k8s.io/api/rbac/v1beta1" + k8srbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1" "k8s.io/kubernetes/pkg/kubectl" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" @@ -486,11 +487,11 @@ func fakeJoinTargetClusterFactory(clusterName, clusterCtx, dnsProvider, tmpDirPa }, }, Rules: []rbacv1beta1.PolicyRule{ - rbacv1beta1.NewRule(rbacv1beta1.VerbAll).Groups(rbacv1beta1.APIGroupAll).Resources(rbacv1beta1.ResourceAll).RuleOrDie(), + k8srbacv1beta1.NewRule(rbacv1beta1.VerbAll).Groups(rbacv1beta1.APIGroupAll).Resources(rbacv1beta1.ResourceAll).RuleOrDie(), }, } - clusterRoleBinding, err := rbacv1beta1.NewClusterBinding(roleName).SAs(util.DefaultFederationSystemNamespace, saName).Binding() + clusterRoleBinding, err := k8srbacv1beta1.NewClusterBinding(roleName).SAs(util.DefaultFederationSystemNamespace, saName).Binding() if err != nil { return nil, err } diff --git a/pkg/api/v1/defaults_test.go b/pkg/api/v1/defaults_test.go index 3985561feba..3b8eba645c2 100644 --- a/pkg/api/v1/defaults_test.go +++ b/pkg/api/v1/defaults_test.go @@ -364,7 +364,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { rc: v1.ReplicationController{ Spec: v1.ReplicationControllerSpec{ Template: &v1.PodTemplateSpec{ - v1.ObjectMeta: metav1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "pod.beta.kubernetes.io/init-containers": ` [ @@ -390,7 +390,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { rc: v1.ReplicationController{ Spec: v1.ReplicationControllerSpec{ Template: &v1.PodTemplateSpec{ - v1.ObjectMeta: metav1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "pod.beta.kubernetes.io/init-containers": ` [ @@ -437,7 +437,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { rc: v1.ReplicationController{ Spec: v1.ReplicationControllerSpec{ Template: &v1.PodTemplateSpec{ - v1.ObjectMeta: metav1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "pod.beta.kubernetes.io/init-containers": ` [ @@ -460,8 +460,8 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { { Ports: []v1.ContainerPort{ { - Name: "default", - v1.Protocol: v1.ProtocolTCP, + Name: "default", + Protocol: v1.ProtocolTCP, }, }, }, @@ -545,7 +545,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { expected: []v1.Container{ { LivenessProbe: &v1.Probe{ - v1.Handler: v1.Handler{ + Handler: v1.Handler{ HTTPGet: &v1.HTTPGetAction{ Path: "/", Scheme: v1.URISchemeHTTP, @@ -557,7 +557,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { FailureThreshold: 3, }, ReadinessProbe: &v1.Probe{ - v1.Handler: v1.Handler{ + Handler: v1.Handler{ HTTPGet: &v1.HTTPGetAction{ Path: "/", Scheme: v1.URISchemeHTTP, @@ -577,7 +577,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { rc: v1.ReplicationController{ Spec: v1.ReplicationControllerSpec{ Template: &v1.PodTemplateSpec{ - v1.ObjectMeta: metav1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{ "pod.beta.kubernetes.io/init-containers": ` [ @@ -605,7 +605,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) { }, expected: []v1.Container{ { - v1.Lifecycle: &v1.Lifecycle{ + Lifecycle: &v1.Lifecycle{ PostStart: &v1.Handler{ HTTPGet: &v1.HTTPGetAction{ Path: "/", @@ -899,7 +899,7 @@ func TestSetDefaulServiceExternalTraffic(t *testing.T) { in = &v1.Service{ Spec: v1.ServiceSpec{Type: v1.ServiceTypeLoadBalancer}, - v1.ObjectMeta: metav1.ObjectMeta{ + ObjectMeta: metav1.ObjectMeta{ Annotations: map[string]string{v1.BetaAnnotationExternalTraffic: v1.AnnotationValueExternalTrafficLocal}, }, } diff --git a/pkg/api/v1/helper/qos/qos_test.go b/pkg/api/v1/helper/qos/qos_test.go index ec4bae3ae86..78cf94da3ee 100644 --- a/pkg/api/v1/helper/qos/qos_test.go +++ b/pkg/api/v1/helper/qos/qos_test.go @@ -19,11 +19,12 @@ package qos import ( "testing" + "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/helper/qos" - "k8s.io/api/core/v1" + k8sv1 "k8s.io/kubernetes/pkg/api/v1" ) func TestGetPodQOS(t *testing.T) { @@ -137,7 +138,7 @@ func TestGetPodQOS(t *testing.T) { // Convert v1.Pod to api.Pod, and then check against `api.helper.GetPodQOS`. pod := api.Pod{} - v1.Convert_v1_Pod_To_api_Pod(testCase.pod, &pod, nil) + k8sv1.Convert_v1_Pod_To_api_Pod(testCase.pod, &pod, nil) if actual := qos.GetPodQOS(&pod); api.PodQOSClass(testCase.expected) != actual { t.Errorf("[%d]: invalid qos pod %s, expected: %s, actual: %s", id, testCase.pod.Name, testCase.expected, actual) diff --git a/pkg/apis/batch/v2alpha1/defaults_test.go b/pkg/apis/batch/v2alpha1/defaults_test.go index bddda88b261..ac76dd46bc1 100644 --- a/pkg/apis/batch/v2alpha1/defaults_test.go +++ b/pkg/apis/batch/v2alpha1/defaults_test.go @@ -38,22 +38,22 @@ func TestSetDefaultCronJob(t *testing.T) { original: &batchv2alpha1.CronJob{}, expected: &batchv2alpha1.CronJob{ Spec: batchv2alpha1.CronJobSpec{ - batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.AllowConcurrent, - Suspend: newBool(false), + ConcurrencyPolicy: batchv2alpha1.AllowConcurrent, + Suspend: newBool(false), }, }, }, "set fields should not be defaulted": { original: &batchv2alpha1.CronJob{ Spec: batchv2alpha1.CronJobSpec{ - batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, - Suspend: newBool(true), + ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, + Suspend: newBool(true), }, }, expected: &batchv2alpha1.CronJob{ Spec: batchv2alpha1.CronJobSpec{ - batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, - Suspend: newBool(true), + ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, + Suspend: newBool(true), }, }, },