Skip to content

K
k3s
Commit 815b894d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #51705 from enj/enj/i/panic_timed_workers_test/51704

Automatic merge from submit-queue (batch tested with PRs 51031, 51705, 51888, 51727, 51684). 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>.. Address panic in TestCancelAndReadd This further increases the timeouts in `timed_workers_test` to reduce the chance of a race condition against the wait group. Signed-off-by: 's avatarMonis Khan <mkhan@redhat.com> Fixes #51704 /assign @gmarek cc @davidopp @timothysc ```release-note NONE ```
parents d4ac62ce 6a62f7f4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
pkg/controller/node/scheduler/timed_workers_test.go
View file @ 815b894d
...@@ -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(time.Second) then := now.Add(3 * 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(time.Second) then := now.Add(3 * 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(time.Second) then := now.Add(3 * 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