Match changes to make []runtime.Object cleaner

openshift · Apr 29, 2015 · 2325917 · 2325917
1 parent 9ce4824
commit 2325917
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pkg/api/validation/validation.go b/pkg/api/validation/validation.go
@@ -79,6 +79,7 @@ func ValidateObject(obj runtime.Object) (errors []error) {
 		errors = templatev.ValidateTemplate(t)
 	default:
 		if list, err := runtime.ExtractList(obj); err == nil {
+			runtime.DecodeList(list, kapi.Scheme)
 			for i := range list {
 				errs := ValidateObject(list[i])
 				errors = append(errors, errs...)

diff --git a/pkg/client/testclient/testclient_test.go b/pkg/client/testclient/testclient_test.go
@@ -12,8 +12,8 @@ import (
 )
 
 func TestNewClient(t *testing.T) {
-	o := testclient.NewObjects(kapi.Scheme)
-	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.json", o); err != nil {
+	o := testclient.NewObjects(kapi.Scheme, kapi.Scheme)
+	if err := testclient.AddObjectsFromPath("../../../test/integration/fixtures/test-deployment-config.json", o, kapi.Scheme); err != nil {
 		t.Fatal(err)
 	}
 	osc, _ := NewFixtureClients(o)
@@ -37,7 +37,7 @@ func TestNewClient(t *testing.T) {
 }
 
 func TestErrors(t *testing.T) {
-	o := testclient.NewObjects(kapi.Scheme)
+	o := testclient.NewObjects(kapi.Scheme, kapi.Scheme)
 	o.Add(&kapi.List{
 		Items: []runtime.Object{
 			&(errors.NewNotFound("DeploymentConfigList", "").(*errors.StatusError).ErrStatus),

diff --git a/pkg/cmd/cli/describe/projectstatus_test.go b/pkg/cmd/cli/describe/projectstatus_test.go
@@ -148,9 +148,9 @@ func TestProjectStatus(t *testing.T) {
 			}
 			return time.Now()
 		}
-		o := ktestclient.NewObjects(kapi.Scheme)
+		o := ktestclient.NewObjects(kapi.Scheme, kapi.Scheme)
 		if len(test.Path) > 0 {
-			if err := ktestclient.AddObjectsFromPath(test.Path, o); err != nil {
+			if err := ktestclient.AddObjectsFromPath(test.Path, o, kapi.Scheme); err != nil {
 				t.Fatal(err)
 			}
 		}