-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[Federation] Improve e2e test setup #44066
Merged
k8s-github-robot
merged 2 commits into
kubernetes:master
from
marun:fed-improve-e2e-setup
Apr 5, 2017
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -40,33 +40,40 @@ import ( | |
type Framework struct { | ||
*framework.Framework | ||
|
||
// To make sure that this framework cleans up after itself, no matter what, | ||
// we install a Cleanup action before each test and clear it after. If we | ||
// should abort, the AfterSuite hook should run all Cleanup actions. | ||
cleanupHandle framework.CleanupActionHandle | ||
|
||
FederationClientset *federation_clientset.Clientset | ||
FederationNamespace *v1.Namespace | ||
} | ||
|
||
func NewDefaultFederatedFramework(baseName string) *Framework { | ||
options := framework.FrameworkOptions{ | ||
ClientQPS: 20, | ||
ClientBurst: 50, | ||
} | ||
f := &Framework{} | ||
|
||
// Register the federation cleanup before initializing the default | ||
// e2e framework to ensure it gets called before the default | ||
// framework's cleanup. | ||
AfterEach(f.FederationAfterEach) | ||
|
||
f := &Framework{&framework.Framework{ | ||
BaseName: baseName, | ||
AddonResourceConstraints: make(map[string]framework.ResourceConstraint), | ||
Options: options, | ||
ClientSet: nil, | ||
}, nil, &v1.Namespace{}} | ||
f.Framework = framework.NewDefaultFramework(baseName) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ugh why does &Framework{} have a Framework ? weird . but i think it makes sense. |
||
f.Framework.SkipNamespaceCreation = true | ||
|
||
BeforeEach(f.BeforeEach) | ||
// Register the federation setup after initializing the default | ||
// e2e framework to ensure it gets called after the default | ||
// framework's setup. | ||
BeforeEach(f.FederationBeforeEach) | ||
AfterEach(f.FederationAfterEach) | ||
AfterEach(f.AfterEach) | ||
|
||
return f | ||
} | ||
|
||
// FederationBeforeEach checks for federation apiserver is ready and makes a namespace. | ||
func (f *Framework) FederationBeforeEach() { | ||
// The fact that we need this feels like a bug in ginkgo. | ||
// https://github.com/onsi/ginkgo/issues/222 | ||
f.cleanupHandle = framework.AddCleanupAction(f.FederationAfterEach) | ||
|
||
if f.FederationClientset == nil { | ||
By("Creating a release 1.5 federation Clientset") | ||
var err error | ||
|
@@ -122,6 +129,8 @@ func (f *Framework) deleteFederationNs() { | |
|
||
// FederationAfterEach deletes the namespace, after reading its events. | ||
func (f *Framework) FederationAfterEach() { | ||
framework.RemoveCleanupAction(f.cleanupHandle) | ||
|
||
// DeleteNamespace at the very end in defer, to avoid any | ||
// expectation failures preventing deleting the namespace. | ||
defer func() { | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ahhh clever :)