Merge pull request #106914 from Jefftree/patch-1

Remove bazel condition check in openapi_test
This commit is contained in:
Kubernetes Prow Robot 2021-12-15 04:42:18 -08:00 committed by GitHub
commit f6243782d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -18,7 +18,6 @@ package openapi
import (
"reflect"
"strings"
"testing"
"k8s.io/apimachinery/pkg/runtime"
@ -45,12 +44,6 @@ func TestGetDefinitionName(t *testing.T) {
// "k8s.io/kubernetes/vendor" prefix.
typePkgName := "k8s.io/apiserver/pkg/endpoints/openapi/testing.TestType"
typeFriendlyName := "io.k8s.apiserver.pkg.endpoints.openapi.testing.TestType"
if strings.HasSuffix(reflect.TypeOf(testType).PkgPath(), "go_default_test") {
// the test is running inside bazel where the package name is changed and
// "go_default_test" will add to package path.
typePkgName = "k8s.io/apiserver/pkg/endpoints/openapi/testing/go_default_test.TestType"
typeFriendlyName = "io.k8s.apiserver.pkg.endpoints.openapi.testing.go_default_test.TestType"
}
s := runtime.NewScheme()
s.AddKnownTypeWithName(testType.GroupVersionKind(), &testType)
namer := NewDefinitionNamer(s)