Skip to content

K
k3s
Unverified Commit 0ef96cba authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #61730 from liggitt/deflake-test-cancel-and-readd

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. increase timeout in TestCancelAndReadd the flakes referenced in #51704 were still seen downstream. the current timeout approach is [known to be faulty](https://github.com/kubernetes/kubernetes/issues/51704#issuecomment-328459239), but fixing the tests has not been prioritized. this increases the timeout sufficiently to avoid flakes in the meantime ```release-note NONE ```
parents 1b950d1e a3dd7ca9
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/controller/nodelifecycle/scheduler/timed_workers_test.go
View file @ 0ef96cba
...@@ -61,7 +61,7 @@ func TestExecuteDelayed(t *testing.T) { ...@@ -61,7 +61,7 @@ func TestExecuteDelayed(t *testing.T) {
return nil return nil
}) })
now := time.Now() now := time.Now()
then := now.Add(3 * time.Second) then := now.Add(10 * time.Second)
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)
queue.AddWork(NewWorkArgs("3", "3"), now, then) queue.AddWork(NewWorkArgs("3", "3"), now, then)
...@@ -89,7 +89,7 @@ func TestCancel(t *testing.T) { ...@@ -89,7 +89,7 @@ func TestCancel(t *testing.T) {
return nil return nil
}) })
now := time.Now() now := time.Now()
then := now.Add(3 * time.Second) then := now.Add(10 * time.Second)
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)
queue.AddWork(NewWorkArgs("3", "3"), now, then) queue.AddWork(NewWorkArgs("3", "3"), now, then)
...@@ -119,7 +119,7 @@ func TestCancelAndReadd(t *testing.T) { ...@@ -119,7 +119,7 @@ func TestCancelAndReadd(t *testing.T) {
return nil return nil
}) })
now := time.Now() now := time.Now()
then := now.Add(3 * time.Second) then := now.Add(10 * time.Second)
queue.AddWork(NewWorkArgs("1", "1"), now, then) queue.AddWork(NewWorkArgs("1", "1"), now, then)
queue.AddWork(NewWorkArgs("2", "2"), now, then) queue.AddWork(NewWorkArgs("2", "2"), now, then)
queue.AddWork(NewWorkArgs("3", "3"), now, then) queue.AddWork(NewWorkArgs("3", "3"), now, then)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment