run pkg/apis/make-origin-dir-compile, pkg/apis compile

This commit is contained in:
Chao Xu
2017-06-22 11:02:38 -07:00
parent 4fb28dafad
commit cd7e7afaaa
98 changed files with 1554 additions and 1487 deletions

View File

@@ -20,6 +20,8 @@ import (
"reflect"
"testing"
batchv2alpha1 "k8s.io/api/batch/v2alpha1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
_ "k8s.io/kubernetes/pkg/api/install"
@@ -29,29 +31,29 @@ import (
func TestSetDefaultCronJob(t *testing.T) {
tests := map[string]struct {
original *CronJob
expected *CronJob
original *batchv2alpha1.CronJob
expected *batchv2alpha1.CronJob
}{
"empty CronJob should default ConcurrencyPolicy and Suspend": {
original: &CronJob{},
expected: &CronJob{
Spec: CronJobSpec{
ConcurrencyPolicy: AllowConcurrent,
Suspend: newBool(false),
"empty batchv2alpha1.CronJob should default batchv2alpha1.ConcurrencyPolicy and Suspend": {
original: &batchv2alpha1.CronJob{},
expected: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.AllowConcurrent,
Suspend: newBool(false),
},
},
},
"set fields should not be defaulted": {
original: &CronJob{
Spec: CronJobSpec{
ConcurrencyPolicy: ForbidConcurrent,
Suspend: newBool(true),
original: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
Suspend: newBool(true),
},
},
expected: &CronJob{
Spec: CronJobSpec{
ConcurrencyPolicy: ForbidConcurrent,
Suspend: newBool(true),
expected: &batchv2alpha1.CronJob{
Spec: batchv2alpha1.CronJobSpec{
batchv2alpha1.ConcurrencyPolicy: batchv2alpha1.ForbidConcurrent,
Suspend: newBool(true),
},
},
},
@@ -61,7 +63,7 @@ func TestSetDefaultCronJob(t *testing.T) {
original := test.original
expected := test.expected
obj2 := roundTrip(t, runtime.Object(original))
actual, ok := obj2.(*CronJob)
actual, ok := obj2.(*batchv2alpha1.CronJob)
if !ok {
t.Errorf("%s: unexpected object: %v", name, actual)
t.FailNow()