github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33466 from k82cn/k8s_26721

Browse Source 
Automatic merge from submit-queue

Fixed flaky unit test (TestDQ_ordered_add_pop).

Fixes #26721
This commit is contained in:
Kubernetes Submit Queue 2016-09-27 08:59:41 -07:00 committed by GitHub
commit 091721d9dc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contrib/mesos/pkg/queue/delay_test.go
View File

@ -180,12 +180,13 @@ func TestDQ_ordered_add_pop(t *testing.T) {
t.Parallel() t.Parallel()
dq := NewDelayQueue() dq := NewDelayQueue()
before := time.Now()
dq.Add(&testjob{d: 2 * time.Second}) dq.Add(&testjob{d: 2 * time.Second})
dq.Add(&testjob{d: 1 * time.Second}) dq.Add(&testjob{d: 1 * time.Second})
dq.Add(&testjob{d: 3 * time.Second}) dq.Add(&testjob{d: 3 * time.Second})
var finished [3]*testjob var finished [3]*testjob
before := time.Now()
idx := int32(-1) idx := int32(-1)
ch := make(chan bool, 3) ch := make(chan bool, 3)
//TODO: replace with `for range finished` once Go 1.3 support is dropped //TODO: replace with `for range finished` once Go 1.3 support is dropped