Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
ff9e1daf
Commit
ff9e1daf
authored
Sep 09, 2016
by
Kubernetes Submit Queue
Committed by
GitHub
Sep 09, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #32358 from wojtek-t/fix_nodes_checking
Automatic merge from submit-queue Fix checking for allowed not-ready nodes in test framework Ref #31215
parents
95771b12
c517811f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
util.go
test/e2e/framework/util.go
+3
-3
No files found.
test/e2e/framework/util.go
View file @
ff9e1daf
...
...
@@ -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
// default test add-ons.
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
err
:=
wait
.
PollImmediate
(
Poll
,
timeout
,
func
()
(
bool
,
error
)
{
...
...
@@ -4246,8 +4246,8 @@ func AllNodesReady(c *client.Client, timeout time.Duration) error {
return
err
}
if
len
(
notReady
)
>
0
{
return
fmt
.
Errorf
(
"Not ready nodes: %v"
,
notReady
)
if
len
(
notReady
)
>
TestContext
.
AllowedNotReadyNodes
||
!
allowedNotReadyReasons
(
notReady
)
{
return
fmt
.
Errorf
(
"Not ready nodes: %
#
v"
,
notReady
)
}
return
nil
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment