scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-04 04:08:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

manually fix unit tests

Browse Source
This commit is contained in:
Chao Xu
2017-06-09 16:41:54 -07:00
parent 847b048fa0
commit 945593d4de
4 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
federation/pkg/kubefed/join_test.go
View File

@@ -24,6 +24,9 @@ import (
"os" "os"
"testing" "testing"
"k8s.io/api/core/v1"
"k8s.io/api/extensions/v1beta1"
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
apiequality "k8s.io/apimachinery/pkg/api/equality" apiequality "k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/util/diff" "k8s.io/apimachinery/pkg/util/diff"
@@ -37,9 +40,7 @@ import (
"k8s.io/kubernetes/federation/pkg/kubefed/util" "k8s.io/kubernetes/federation/pkg/kubefed/util"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/testapi" "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/api/core/v1" k8srbacv1beta1 "k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
"k8s.io/api/extensions/v1beta1"
rbacv1beta1 "k8s.io/api/rbac/v1beta1"
"k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/kubectl"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util" cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
@@ -486,11 +487,11 @@ func fakeJoinTargetClusterFactory(clusterName, clusterCtx, dnsProvider, tmpDirPa
}, },
}, },
Rules: []rbacv1beta1.PolicyRule{ 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 { if err != nil {
return nil, err return nil, err
} }

18
pkg/api/v1/defaults_test.go
View File

@@ -364,7 +364,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
v1.ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"pod.beta.kubernetes.io/init-containers": ` "pod.beta.kubernetes.io/init-containers": `
[ [
@@ -390,7 +390,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
v1.ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"pod.beta.kubernetes.io/init-containers": ` "pod.beta.kubernetes.io/init-containers": `
[ [
@@ -437,7 +437,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
v1.ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"pod.beta.kubernetes.io/init-containers": ` "pod.beta.kubernetes.io/init-containers": `
[ [
@@ -461,7 +461,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
Ports: []v1.ContainerPort{ Ports: []v1.ContainerPort{
{ {
Name: "default", Name: "default",
v1.Protocol: v1.ProtocolTCP, Protocol: v1.ProtocolTCP,
}, },
}, },
}, },
@@ -545,7 +545,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
expected: []v1.Container{ expected: []v1.Container{
{ {
LivenessProbe: &v1.Probe{ LivenessProbe: &v1.Probe{
v1.Handler: v1.Handler{ Handler: v1.Handler{
HTTPGet: &v1.HTTPGetAction{ HTTPGet: &v1.HTTPGetAction{
Path: "/", Path: "/",
Scheme: v1.URISchemeHTTP, Scheme: v1.URISchemeHTTP,
@@ -557,7 +557,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
FailureThreshold: 3, FailureThreshold: 3,
}, },
ReadinessProbe: &v1.Probe{ ReadinessProbe: &v1.Probe{
v1.Handler: v1.Handler{ Handler: v1.Handler{
HTTPGet: &v1.HTTPGetAction{ HTTPGet: &v1.HTTPGetAction{
Path: "/", Path: "/",
Scheme: v1.URISchemeHTTP, Scheme: v1.URISchemeHTTP,
@@ -577,7 +577,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
rc: v1.ReplicationController{ rc: v1.ReplicationController{
Spec: v1.ReplicationControllerSpec{ Spec: v1.ReplicationControllerSpec{
Template: &v1.PodTemplateSpec{ Template: &v1.PodTemplateSpec{
v1.ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"pod.beta.kubernetes.io/init-containers": ` "pod.beta.kubernetes.io/init-containers": `
[ [
@@ -605,7 +605,7 @@ func TestSetDefaultReplicationControllerInitContainers(t *testing.T) {
}, },
expected: []v1.Container{ expected: []v1.Container{
{ {
v1.Lifecycle: &v1.Lifecycle{ Lifecycle: &v1.Lifecycle{
PostStart: &v1.Handler{ PostStart: &v1.Handler{
HTTPGet: &v1.HTTPGetAction{ HTTPGet: &v1.HTTPGetAction{
Path: "/", Path: "/",
@@ -899,7 +899,7 @@ func TestSetDefaulServiceExternalTraffic(t *testing.T) {
in = &v1.Service{ in = &v1.Service{
Spec: v1.ServiceSpec{Type: v1.ServiceTypeLoadBalancer}, Spec: v1.ServiceSpec{Type: v1.ServiceTypeLoadBalancer},
v1.ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{v1.BetaAnnotationExternalTraffic: v1.AnnotationValueExternalTrafficLocal}, Annotations: map[string]string{v1.BetaAnnotationExternalTraffic: v1.AnnotationValueExternalTrafficLocal},
}, },
} }

5
pkg/api/v1/helper/qos/qos_test.go
View File

@@ -19,11 +19,12 @@ package qos
import ( import (
"testing" "testing"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource" "k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/helper/qos" "k8s.io/kubernetes/pkg/api/helper/qos"
"k8s.io/api/core/v1" k8sv1 "k8s.io/kubernetes/pkg/api/v1"
) )
func TestGetPodQOS(t *testing.T) { 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`. // Convert v1.Pod to api.Pod, and then check against `api.helper.GetPodQOS`.
pod := api.Pod{} 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 { 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) t.Errorf("[%d]: invalid qos pod %s, expected: %s, actual: %s", id, testCase.pod.Name, testCase.expected, actual)

6
pkg/apis/batch/v2alpha1/defaults_test.go
View File

@@ -38,7 +38,7 @@ func TestSetDefaultCronJob(t *testing.T) {
original: &batchv2alpha1.CronJob{}, original: &batchv2alpha1.CronJob{},
expected: &batchv2alpha1.CronJob{ expected: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{ Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.AllowConcurrent, ConcurrencyPolicy: batchv2alpha1.AllowConcurrent,
Suspend: newBool(false), Suspend: newBool(false),
}, },
}, },
@@ -46,13 +46,13 @@ func TestSetDefaultCronJob(t *testing.T) {
"set fields should not be defaulted": { "set fields should not be defaulted": {
original: &batchv2alpha1.CronJob{ original: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{ Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
Suspend: newBool(true), Suspend: newBool(true),
}, },
}, },
expected: &batchv2alpha1.CronJob{ expected: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{ Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent, ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
Suspend: newBool(true), Suspend: newBool(true),
}, },
}, },