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

update tests to be specific about the versions they are testing instead of floating

Browse Source
This commit is contained in:
David Eads
2018-05-01 10:54:37 -04:00
parent f03f83a20a
commit 94e3d94d67
108 changed files with 270 additions and 418 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/apis/core/install/BUILD
View File

@@ -31,6 +31,7 @@ go_test(
"//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
"//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
],
)

5
pkg/apis/core/install/install_test.go
View File

@@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api/legacyscheme"
internal "k8s.io/kubernetes/pkg/apis/core"
)
@@ -52,7 +53,7 @@ func TestCodec(t *testing.T) {
pod := internal.Pod{}
// We do want to use package registered rather than testapi here, because we
// want to test if the package install and package registered work as expected.
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersions[0]), &pod)
data, err := runtime.Encode(legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "", Version: "v1"}), &pod)
if err != nil {
t.Fatalf("unexpected error: %v", err)
}
@@ -60,7 +61,7 @@ func TestCodec(t *testing.T) {
if err := json.Unmarshal(data, &other); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if other.APIVersion != legacyscheme.Registry.GroupOrDie(internal.GroupName).GroupVersions[0].Version || other.Kind != "Pod" {
if other.APIVersion != "v1" || other.Kind != "Pod" {
t.Errorf("unexpected unmarshalled object %#v", other)
}
}

1
pkg/apis/core/validation/BUILD
View File

@@ -50,7 +50,6 @@ go_test(
],
embed = [":go_default_library"],
deps = [
"//pkg/api/legacyscheme:go_default_library",
"//pkg/api/testapi:go_default_library",
"//pkg/apis/core:go_default_library",
"//pkg/capabilities:go_default_library",

33
pkg/apis/core/validation/validation_test.go
View File

@@ -32,7 +32,6 @@ import (
"k8s.io/apimachinery/pkg/util/validation/field"
utilfeature "k8s.io/apiserver/pkg/util/feature"
utilfeaturetesting "k8s.io/apiserver/pkg/util/feature/testing"
"k8s.io/kubernetes/pkg/api/legacyscheme"
_ "k8s.io/kubernetes/pkg/api/testapi"
"k8s.io/kubernetes/pkg/apis/core"
"k8s.io/kubernetes/pkg/capabilities"
@@ -4025,7 +4024,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.annotations['key']",
},
},
@@ -4034,7 +4033,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.labels['key']",
},
},
@@ -4043,7 +4042,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.name",
},
},
@@ -4052,7 +4051,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.namespace",
},
},
@@ -4061,7 +4060,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.uid",
},
},
@@ -4070,7 +4069,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "spec.nodeName",
},
},
@@ -4079,7 +4078,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "spec.serviceAccountName",
},
},
@@ -4088,7 +4087,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "status.hostIP",
},
},
@@ -4097,7 +4096,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "status.podIP",
},
},
@@ -4166,7 +4165,7 @@ func TestValidateEnv(t *testing.T) {
Value: "foo",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.name",
},
},
@@ -4187,7 +4186,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.name",
},
SecretKeyRef: &core.SecretKeySelector{
@@ -4206,7 +4205,7 @@ func TestValidateEnv(t *testing.T) {
Name: "some_var_name",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.name",
},
ConfigMapKeyRef: &core.ConfigMapKeySelector{
@@ -4225,7 +4224,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
FieldPath: "metadata.name",
},
SecretKeyRef: &core.SecretKeySelector{
@@ -4278,7 +4277,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
},
},
}},
@@ -4303,7 +4302,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
FieldPath: "metadata.whoops",
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
},
},
}},
@@ -4381,7 +4380,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &core.EnvVarSource{
FieldRef: &core.ObjectFieldSelector{
FieldPath: "status.phase",
APIVersion: legacyscheme.Registry.GroupOrDie(core.GroupName).GroupVersions[0].String(),
APIVersion: "v1",
},
},
}},