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

Expose options field in e2e framework structure

Browse Source
This commit is contained in:
shashidharatd
2017-01-25 01:24:29 +05:30
parent 73b547a8f5
commit e46169f527
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -84,7 +84,7 @@ type Framework struct {
cleanupHandle CleanupActionHandle cleanupHandle CleanupActionHandle
// configuration for framework's client // configuration for framework's client
options FrameworkOptions Options FrameworkOptions
} }
type TestDataSummary interface { type TestDataSummary interface {
@@ -110,7 +110,7 @@ func NewDefaultFramework(baseName string) *Framework {
func NewDefaultGroupVersionFramework(baseName string, groupVersion schema.GroupVersion) *Framework { func NewDefaultGroupVersionFramework(baseName string, groupVersion schema.GroupVersion) *Framework {
f := NewDefaultFramework(baseName) f := NewDefaultFramework(baseName)
f.options.GroupVersion = &groupVersion f.Options.GroupVersion = &groupVersion
return f return f
} }
@@ -118,7 +118,7 @@ func NewFramework(baseName string, options FrameworkOptions, client clientset.In
f := &Framework{ f := &Framework{
BaseName: baseName, BaseName: baseName,
AddonResourceConstraints: make(map[string]ResourceConstraint), AddonResourceConstraints: make(map[string]ResourceConstraint),
options: options, Options: options,
ClientSet: client, ClientSet: client,
} }
@@ -169,10 +169,10 @@ func (f *Framework) BeforeEach() {
By("Creating a kubernetes client") By("Creating a kubernetes client")
config, err := LoadConfig() config, err := LoadConfig()
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 { if f.Options.GroupVersion != nil {
config.GroupVersion = f.options.GroupVersion config.GroupVersion = f.Options.GroupVersion
} }
if TestContext.KubeAPIContentType != "" { if TestContext.KubeAPIContentType != "" {
config.ContentType = TestContext.KubeAPIContentType config.ContentType = TestContext.KubeAPIContentType