github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix tests.

Browse Source
This commit is contained in:
Madhusudan.C.S
2016-01-27 11:10:06 -08:00
parent 73fb6dca62
commit 559bf168ff
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/apis/extensions/v1beta1/defaults_test.go
View File

@@ -45,6 +45,14 @@ func TestSetDefaultDaemonSet(t *testing.T) {
Labels: defaultLabels, Labels: defaultLabels,
}, },
} }
templateNoLabel := v1.PodTemplateSpec{
Spec: v1.PodSpec{
DNSPolicy: v1.DNSClusterFirst,
RestartPolicy: v1.RestartPolicyAlways,
SecurityContext: &v1.PodSecurityContext{},
TerminationGracePeriodSeconds: &period,
},
}
tests := []struct { tests := []struct {
original *DaemonSet original *DaemonSet
expected *DaemonSet expected *DaemonSet
@@ -116,6 +124,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
original: &DaemonSet{}, original: &DaemonSet{},
expected: &DaemonSet{ expected: &DaemonSet{
Spec: DaemonSetSpec{ Spec: DaemonSetSpec{
Template: templateNoLabel,
UpdateStrategy: DaemonSetUpdateStrategy{ UpdateStrategy: DaemonSetUpdateStrategy{
Type: RollingUpdateDaemonSetStrategyType, Type: RollingUpdateDaemonSetStrategyType,
RollingUpdate: &RollingUpdateDaemonSet{ RollingUpdate: &RollingUpdateDaemonSet{
@@ -136,6 +145,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
}, },
expected: &DaemonSet{ expected: &DaemonSet{
Spec: DaemonSetSpec{ Spec: DaemonSetSpec{
Template: templateNoLabel,
UpdateStrategy: DaemonSetUpdateStrategy{ UpdateStrategy: DaemonSetUpdateStrategy{
Type: RollingUpdateDaemonSetStrategyType, Type: RollingUpdateDaemonSetStrategyType,
RollingUpdate: &RollingUpdateDaemonSet{ RollingUpdate: &RollingUpdateDaemonSet{
@@ -157,6 +167,7 @@ func TestSetDefaultDaemonSet(t *testing.T) {
}, },
expected: &DaemonSet{ expected: &DaemonSet{
Spec: DaemonSetSpec{ Spec: DaemonSetSpec{
Template: templateNoLabel,
UpdateStrategy: DaemonSetUpdateStrategy{ UpdateStrategy: DaemonSetUpdateStrategy{
Type: RollingUpdateDaemonSetStrategyType, Type: RollingUpdateDaemonSetStrategyType,
RollingUpdate: &RollingUpdateDaemonSet{ RollingUpdate: &RollingUpdateDaemonSet{

12
pkg/apis/extensions/validation/validation_test.go
View File

@@ -726,7 +726,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: "", Type: "",
RollingUpdate: &extensions.RollingUpdateDaemonSet{ RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -742,7 +742,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType, Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: nil, RollingUpdate: nil,
@@ -756,7 +756,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType, Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: &extensions.RollingUpdateDaemonSet{ RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -773,7 +773,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType, Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: &extensions.RollingUpdateDaemonSet{ RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -790,7 +790,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType, Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: &extensions.RollingUpdateDaemonSet{ RollingUpdate: &extensions.RollingUpdateDaemonSet{
@@ -807,7 +807,7 @@ func TestValidateDaemonSet(t *testing.T) {
}, },
Spec: extensions.DaemonSetSpec{ Spec: extensions.DaemonSetSpec{
Selector: &extensions.LabelSelector{MatchLabels: validSelector}, Selector: &extensions.LabelSelector{MatchLabels: validSelector},
Template: &validPodTemplate.Template, Template: validPodTemplate.Template,
UpdateStrategy: extensions.DaemonSetUpdateStrategy{ UpdateStrategy: extensions.DaemonSetUpdateStrategy{
Type: extensions.RollingUpdateDaemonSetStrategyType, Type: extensions.RollingUpdateDaemonSetStrategyType,
RollingUpdate: &extensions.RollingUpdateDaemonSet{ RollingUpdate: &extensions.RollingUpdateDaemonSet{