Merge pull request #22913 from liggitt/unit-test-package

Auto commit by PR queue bot
kubernetes · Mar 24, 2016 · dae5ac4 · dae5ac4 · k8s-teamcity-mesosphere · Mar 24, 2016
2 parents f3af5d2 + 3594370
commit dae5ac4
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/pkg/api/ref_test.go b/pkg/api/ref_test.go
@@ -36,6 +36,14 @@ type ExtensionAPIObject struct {
 func (obj *ExtensionAPIObject) GetObjectKind() unversioned.ObjectKind { return &obj.TypeMeta }
 
 func TestGetReference(t *testing.T) {
+
+	// when vendoring kube, if you don't force the set of registered versions (like this hack/test-go.sh does)
+	// then you run into trouble because the types aren't registered in the scheme by anything.  This does the
+	// register manually to allow unit test execution
+	if _, err := Scheme.ObjectKind(&Pod{}); err != nil {
+		AddToScheme(Scheme)
+	}
+
 	table := map[string]struct {
 		obj       runtime.Object
 		ref       *ObjectReference