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

Revert "remove dup pkg and update reference"

Browse Source 
This reverts commit 93be3f7735.

Revert "update vendor kube-openapi"

This reverts commit 006f80e35d.
This commit is contained in:
ymqytw
2017-09-06 11:34:28 -07:00
parent 7be29bd9b6
commit c17103f184
29 changed files with 346 additions and 7073 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubectl/cmd/util/openapi/openapi_getter_test.go
View File

@@ -18,21 +18,17 @@ package openapi_test
import (
"fmt"
"path/filepath"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
oapi "k8s.io/kube-openapi/pkg/util/proto"
tst "k8s.io/kube-openapi/pkg/util/proto/testing"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
var fakeSchema = tst.Fake{Path: filepath.Join("..", "..", "..", "..", "..", "api", "openapi-spec", "swagger.json")}
var _ = Describe("Getting the Resources", func() {
var client *tst.FakeClient
var expectedData oapi.Resources
var expectedData openapi.Resources
var instance openapi.Getter
BeforeEach(func() {
@@ -40,7 +36,7 @@ var _ = Describe("Getting the Resources", func() {
d, err := fakeSchema.OpenAPISchema()
Expect(err).To(BeNil())
expectedData, err = oapi.NewOpenAPIData(d, openapi.ParseGroupVersionKind)
expectedData, err = openapi.NewOpenAPIData(d)
Expect(err).To(BeNil())
instance = openapi.NewOpenAPIGetter(client)