Merge pull request #59414 from mbohlool/test_cycle

Automatic merge from submit-queue (batch tested with PRs 59414, 64096). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix cyclic dependency of apiserver test for OpenAPI test Fixes #41748 ```release-note NONE ```

Merge pull request #59414 from mbohlool/test_cycle
f5fb740f · Kubernetes Submit Queue · GitHub · 1f0d9505 · 9e94cf72 · f5fb740f
Unverified Commit f5fb740f authored May 21, 2018 by Kubernetes Submit Queue Committed by GitHub May 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 9 deletions

BUILD staging/src/k8s.io/apiserver/pkg/server/BUILD +1 -0

genericapiserver_test.go .../src/k8s.io/apiserver/pkg/server/genericapiserver_test.go +9 -9

No files found.
--- a/staging/src/k8s.io/apiserver/pkg/server/BUILD
+++ b/staging/src/k8s.io/apiserver/pkg/server/BUILD
@@ -33,6 +33,7 @@ go_test(
        "//vendor/k8s.io/client-go/informers:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
        "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/k8s.io/kube-openapi/pkg/common:go_default_library",
    ],
 )

--- a/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go
+++ b/staging/src/k8s.io/apiserver/pkg/server/genericapiserver_test.go
@@ -31,7 +31,6 @@ import (
 	"testing"
 	"time"
-	// "github.com/go-openapi/spec"
 	"github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -50,6 +49,7 @@ import (
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
 	restclient "k8s.io/client-go/rest"
+	kubeopenapi "k8s.io/kube-openapi/pkg/common"
 )
 const (
@@ -77,6 +77,12 @@ func init() {
 	examplev1.AddToScheme(scheme)
 }
+func testGetOpenAPIDefinitions(_ kubeopenapi.ReferenceCallback) map[string]kubeopenapi.OpenAPIDefinition {
+	return map[string]kubeopenapi.OpenAPIDefinition{
+		"k8s.io/apimachinery/pkg/apis/meta/v1.APIGroupList": {},
+	}
+}
 // setUp is a convience function for setting up for (most) tests.
 func setUp(t *testing.T) (Config, *assert.Assertions) {
 	config := NewConfig(codecs)
@@ -89,14 +95,8 @@ func setUp(t *testing.T) (Config, *assert.Assertions) {
 		t.Fatal("unable to create fake client set")
 	}
-	// TODO restore this test, but right now, eliminate our cycle
+	config.OpenAPIConfig = DefaultOpenAPIConfig(testGetOpenAPIDefinitions, runtime.NewScheme())
-	// config.OpenAPIConfig = DefaultOpenAPIConfig(testGetOpenAPIDefinitions, runtime.NewScheme())
+	config.OpenAPIConfig.Info.Version = "unversioned"
-	// config.OpenAPIConfig.Info = &spec.Info{
-	// 	InfoProps: spec.InfoProps{
-	// 		Title:   "Kubernetes",
-	// 		Version: "unversioned",
-	// 	},
-	// }
 	config.SwaggerConfig = DefaultSwaggerConfig()
 	sharedInformers := informers.NewSharedInformerFactory(clientset, config.LoopbackClientConfig.Timeout)
 	config.Complete(sharedInformers)