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

Fixed empty name error and also changed tests

Browse Source
This commit is contained in:
Manan Saraf
2015-06-09 15:19:04 -07:00
parent 366b382901
commit b2ebfeef25
3 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2245,7 +2245,7 @@ func TestValidateReplicationController(t *testing.T) {
for i := range errs {
field := errs[i].(*errors.ValidationError).Field
if !strings.HasPrefix(field, "spec.template.") &&
field != "metadata.name" &&
field != "metadata.name or metadata.generateName" &&
field != "metadata.namespace" &&
field != "spec.selector" &&
field != "spec.template" &&
@@ -2360,11 +2360,11 @@ func TestValidateNode(t *testing.T) {
for i := range errs {
field := errs[i].(*errors.ValidationError).Field
expectedFields := map[string]bool{
"metadata.name": true,
"metadata.labels": true,
"metadata.annotations": true,
"metadata.namespace": true,
"spec.ExternalID": true,
"metadata.name or metadata.generateName": true,
"metadata.labels": true,
"metadata.annotations": true,
"metadata.namespace": true,
"spec.ExternalID": true,
}
if expectedFields[field] == false {
t.Errorf("%s: missing prefix for: %v", k, errs[i])
@@ -2894,7 +2894,7 @@ func TestValidateResourceQuota(t *testing.T) {
for i := range errs {
field := errs[i].(*errors.ValidationError).Field
detail := errs[i].(*errors.ValidationError).Detail
if field != "metadata.name" && field != "metadata.namespace" {
if field != "metadata.name" && field != "metadata.name or metadata.generateName" && field != "metadata.namespace" {
t.Errorf("%s: missing prefix for: %v", k, field)
}
if detail != v.D {