github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

update testapi to eliminate redundant fields

Browse Source
This commit is contained in:
deads2k
2015-11-30 15:28:48 -05:00
parent ec1ba7438f
commit 2ee3dfe415
51 changed files with 203 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/validation/schema_test.go
View File

@@ -28,7 +28,7 @@ import (
)
func readPod(filename string) (string, error) {
data, err := ioutil.ReadFile("testdata/" + testapi.Default.Version() + "/" + filename)
data, err := ioutil.ReadFile("testdata/" + testapi.Default.GroupVersion().Version + "/" + filename)
if err != nil {
return "", err
}
@@ -36,7 +36,8 @@ func readPod(filename string) (string, error) {
}
func loadSchemaForTest() (Schema, error) {
pathToSwaggerSpec := "../../../api/swagger-spec/" + testapi.Default.Version() + ".json"
// TODO this path is broken
pathToSwaggerSpec := "../../../api/swagger-spec/" + testapi.Default.GroupVersion().Version + ".json"
data, err := ioutil.ReadFile(pathToSwaggerSpec)
if err != nil {
return nil, err

10
pkg/api/validation/validation_test.go
View File

@@ -806,7 +806,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
APIVersion: testapi.Default.Version(),
APIVersion: testapi.Default.GroupVersion().String(),
FieldPath: "metadata.name",
},
},
@@ -838,7 +838,7 @@ func TestValidateEnv(t *testing.T) {
Value: "foo",
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
APIVersion: testapi.Default.Version(),
APIVersion: testapi.Default.GroupVersion().String(),
FieldPath: "metadata.name",
},
},
@@ -851,7 +851,7 @@ func TestValidateEnv(t *testing.T) {
Name: "abc",
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
APIVersion: testapi.Default.Version(),
APIVersion: testapi.Default.GroupVersion().String(),
},
},
}},
@@ -876,7 +876,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
FieldPath: "metadata.whoops",
APIVersion: testapi.Default.Version(),
APIVersion: testapi.Default.GroupVersion().String(),
},
},
}},
@@ -915,7 +915,7 @@ func TestValidateEnv(t *testing.T) {
ValueFrom: &api.EnvVarSource{
FieldRef: &api.ObjectFieldSelector{
FieldPath: "status.phase",
APIVersion: testapi.Default.Version(),
APIVersion: testapi.Default.GroupVersion().String(),
},
},
}},