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

Merge pull request #32358 from wojtek-t/fix_nodes_checking

Browse Source 
Automatic merge from submit-queue

Fix checking for allowed not-ready nodes in test framework

Ref #31215
This commit is contained in:
Kubernetes Submit Queue
2016-09-09 01:37:49 -07:00
committed by GitHub
parent 95771b12e9 c517811fc8
commit ff9e1daf33
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/framework/util.go
View File

@@ -4213,7 +4213,7 @@ func allowedNotReadyReasons(nodes []*api.Node) bool {
// and figure out how to do it in a configurable way, as we can't expect all setups to run // and figure out how to do it in a configurable way, as we can't expect all setups to run
// default test add-ons. // default test add-ons.
func AllNodesReady(c *client.Client, timeout time.Duration) error { func AllNodesReady(c *client.Client, timeout time.Duration) error {
Logf("Waiting up to %v for all (but %d) nodes to be ready", TestContext.AllowedNotReadyNodes, timeout) Logf("Waiting up to %v for all (but %d) nodes to be ready", timeout, TestContext.AllowedNotReadyNodes)
var notReady []*api.Node var notReady []*api.Node
err := wait.PollImmediate(Poll, timeout, func() (bool, error) { err := wait.PollImmediate(Poll, timeout, func() (bool, error) {
@@ -4246,8 +4246,8 @@ func AllNodesReady(c *client.Client, timeout time.Duration) error {
return err return err
} }
if len(notReady) > 0 { if len(notReady) > TestContext.AllowedNotReadyNodes || !allowedNotReadyReasons(notReady) {
return fmt.Errorf("Not ready nodes: %v", notReady) return fmt.Errorf("Not ready nodes: %#v", notReady)
} }
return nil return nil
} }