github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow setting GroupVersion in e2e tests

pull/6/head
Maciej Szulik 2016-08-08 16:36:46 +02:00
parent 7d00b427ef
commit 578730e26e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test/e2e/framework/framework.go
View File

@ -32,6 +32,7 @@ import (
"k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4" "k8s.io/kubernetes/federation/client/clientset_generated/federation_release_1_4"
"k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api"
apierrs "k8s.io/kubernetes/pkg/api/errors" apierrs "k8s.io/kubernetes/pkg/api/errors"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_2"
"k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3" "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_3"
"k8s.io/kubernetes/pkg/client/restclient" "k8s.io/kubernetes/pkg/client/restclient"
@ -95,8 +96,9 @@ type TestDataSummary interface {
} }
type FrameworkOptions struct { type FrameworkOptions struct {
ClientQPS float32 ClientQPS float32
ClientBurst int ClientBurst int
GroupVersion *unversioned.GroupVersion
} }
// NewFramework makes a new framework and sets up a BeforeEach/AfterEach for // NewFramework makes a new framework and sets up a BeforeEach/AfterEach for
@ -172,6 +174,9 @@ func (f *Framework) BeforeEach() {
Expect(err).NotTo(HaveOccurred()) Expect(err).NotTo(HaveOccurred())
config.QPS = f.options.ClientQPS config.QPS = f.options.ClientQPS
config.Burst = f.options.ClientBurst config.Burst = f.options.ClientBurst
if f.options.GroupVersion != nil {
config.GroupVersion = f.options.GroupVersion
}
if TestContext.KubeAPIContentType != "" { if TestContext.KubeAPIContentType != "" {
config.ContentType = TestContext.KubeAPIContentType config.ContentType = TestContext.KubeAPIContentType
} }