github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-11-12 21:40:29 +00:00
Code Issues Projects Releases Wiki Activity

use WithoutCancel interface w/ Pop(nil)

Browse Source
This commit is contained in:
James DeFelice
2015-12-12 15:33:48 +00:00
parent af95e3fe0e
commit 26593f1a6a
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/mesos/pkg/queue/historical_test.go
View File

@@ -75,7 +75,7 @@ func TestFIFO_basic(t *testing.T) {
lastInt := _int(0)
lastUint := _uint(0)
for i := 0; i < amount*2; i++ {
switch obj := f.Pop(nil).(type) {
switch obj := f.Pop(WithoutCancel()).(type) {
case _int:
if obj <= lastInt {
t.Errorf("got %v (int) out of order, last was %v", obj, lastInt)
@@ -100,7 +100,7 @@ func TestFIFO_addUpdate(t *testing.T) {
got := make(chan *testObj, 2)
go func() {
for {
got <- f.Pop(nil).(*testObj)
got <- f.Pop(WithoutCancel()).(*testObj)
}
}()
@@ -126,7 +126,7 @@ func TestFIFO_addReplace(t *testing.T) {
got := make(chan *testObj, 2)
go func() {
for {
got <- f.Pop(nil).(*testObj)
got <- f.Pop(WithoutCancel()).(*testObj)
}
}()
@@ -158,24 +158,24 @@ func TestFIFO_detectLineJumpers(t *testing.T) {
done := make(chan struct{})
go func() {
defer close(done)
if e, a := 13, f.Pop(nil).(*testObj).value; a != e {
if e, a := 13, f.Pop(WithoutCancel()).(*testObj).value; a != e {
err = fmt.Errorf("expected %d, got %d", e, a)
return
}
f.Add(&testObj{"foo", 14}) // ensure foo doesn't jump back in line
if e, a := 1, f.Pop(nil).(*testObj).value; a != e {
if e, a := 1, f.Pop(WithoutCancel()).(*testObj).value; a != e {
err = fmt.Errorf("expected %d, got %d", e, a)
return
}
if e, a := 30, f.Pop(nil).(*testObj).value; a != e {
if e, a := 30, f.Pop(WithoutCancel()).(*testObj).value; a != e {
err = fmt.Errorf("expected %d, got %d", e, a)
return
}
if e, a := 14, f.Pop(nil).(*testObj).value; a != e {
if e, a := 14, f.Pop(WithoutCancel()).(*testObj).value; a != e {
err = fmt.Errorf("expected %d, got %d", e, a)
return
}