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

Review comments

Browse Source
This commit is contained in:
Clayton Coleman
2015-11-18 18:28:06 -05:00
parent 61270f4534
commit e9e02bdd50
5 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ func TestSetDefaultDeployment(t *testing.T) {
original: &Deployment{},
expected: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(1),
Replicas: newInt32(1),
Strategy: DeploymentStrategy{
Type: RollingUpdateDeploymentStrategyType,
RollingUpdate: &RollingUpdateDeployment{
@@ -121,7 +121,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{
original: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
RollingUpdate: &RollingUpdateDeployment{
MaxSurge: &differentIntOrString,
@@ -131,7 +131,7 @@ func TestSetDefaultDeployment(t *testing.T) {
},
expected: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
Type: RollingUpdateDeploymentStrategyType,
RollingUpdate: &RollingUpdateDeployment{
@@ -147,7 +147,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{
original: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
@@ -155,7 +155,7 @@ func TestSetDefaultDeployment(t *testing.T) {
},
expected: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
@@ -167,7 +167,7 @@ func TestSetDefaultDeployment(t *testing.T) {
{
original: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
@@ -176,7 +176,7 @@ func TestSetDefaultDeployment(t *testing.T) {
},
expected: &Deployment{
Spec: DeploymentSpec{
Replicas: newInt(5),
Replicas: newInt32(5),
Strategy: DeploymentStrategy{
Type: RecreateDeploymentStrategyType,
},
@@ -208,8 +208,8 @@ func TestSetDefaultJob(t *testing.T) {
Selector: &PodSelector{
MatchLabels: map[string]string{"job": "selector"},
},
Completions: newInt(1),
Parallelism: newInt(1),
Completions: newInt32(1),
Parallelism: newInt32(1),
},
}
tests := []*Job{
@@ -234,7 +234,7 @@ func TestSetDefaultJob(t *testing.T) {
// selector from template labels, completions set explicitly, parallelism - default
{
Spec: JobSpec{
Completions: newInt(1),
Completions: newInt32(1),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},
@@ -245,7 +245,7 @@ func TestSetDefaultJob(t *testing.T) {
// selector from template labels, completions - default, parallelism set explicitly
{
Spec: JobSpec{
Parallelism: newInt(1),
Parallelism: newInt32(1),
Template: v1.PodTemplateSpec{
ObjectMeta: v1.ObjectMeta{
Labels: map[string]string{"job": "selector"},
@@ -294,9 +294,9 @@ func roundTrip(t *testing.T, obj runtime.Object) runtime.Object {
return obj3
}
func newInt(val int) *int32 {
func newInt32(val int32) *int32 {
p := new(int32)
*p = int32(val)
*p = val
return p
}