Skip to content

Commit b8f3095

Browse files
committedJun 2, 2016
Merge pull request kubernetes#26700 from deads2k/debug-flake
add logging for flake kubernetes#26689
2 parents a44d027 + bf22534 commit b8f3095

File tree

1 file changed

+12
-7
lines changed

1 file changed

+12
-7
lines changed
 

Diff for: ‎pkg/util/workqueue/delaying_queue_test.go

+12-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func TestSimpleQueue(t *testing.T) {
4343

4444
fakeClock.Step(60 * time.Millisecond)
4545

46-
if err := waitForAdded(q, 1); err != nil {
46+
if err := waitForAdded(t, q, 1); err != nil {
4747
t.Errorf("should have added")
4848
}
4949
item, _ := q.Get()
@@ -88,7 +88,7 @@ func TestAddTwoFireEarly(t *testing.T) {
8888

8989
fakeClock.Step(60 * time.Millisecond)
9090

91-
if err := waitForAdded(q, 1); err != nil {
91+
if err := waitForAdded(t, q, 1); err != nil {
9292
t.Fatalf("unexpected err: %v", err)
9393
}
9494
item, _ := q.Get()
@@ -99,7 +99,7 @@ func TestAddTwoFireEarly(t *testing.T) {
9999
q.AddAfter(third, 2*time.Second)
100100

101101
fakeClock.Step(1 * time.Second)
102-
if err := waitForAdded(q, 1); err != nil {
102+
if err := waitForAdded(t, q, 1); err != nil {
103103
t.Fatalf("unexpected err: %v", err)
104104
}
105105
item, _ = q.Get()
@@ -108,7 +108,7 @@ func TestAddTwoFireEarly(t *testing.T) {
108108
}
109109

110110
fakeClock.Step(2 * time.Second)
111-
if err := waitForAdded(q, 1); err != nil {
111+
if err := waitForAdded(t, q, 1); err != nil {
112112
t.Fatalf("unexpected err: %v", err)
113113
}
114114
item, _ = q.Get()
@@ -139,7 +139,7 @@ func TestCopyShifting(t *testing.T) {
139139

140140
fakeClock.Step(2 * time.Second)
141141

142-
if err := waitForAdded(q, 3); err != nil {
142+
if err := waitForAdded(t, q, 3); err != nil {
143143
t.Fatalf("unexpected err: %v", err)
144144
}
145145
actualFirst, _ := q.Get()
@@ -156,14 +156,19 @@ func TestCopyShifting(t *testing.T) {
156156
}
157157
}
158158

159-
func waitForAdded(q DelayingInterface, depth int) error {
160-
return wait.Poll(1*time.Millisecond, 10*time.Second, func() (done bool, err error) {
159+
func waitForAdded(t *testing.T, q DelayingInterface, depth int) error {
160+
err := wait.Poll(1*time.Millisecond, 20*time.Second, func() (done bool, err error) {
161161
if q.Len() == depth {
162162
return true, nil
163163
}
164164

165165
return false, nil
166166
})
167+
168+
if err != nil {
169+
t.Logf("failed: len=%v, everything=%#v", q.Len(), q)
170+
}
171+
return err
167172
}
168173

169174
func waitForWaitingQueueToFill(q DelayingInterface) error {

0 commit comments

Comments
 (0)
Please sign in to comment.