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

Merge pull request #790 from nyaxt/flakyetcd

Browse Source 
Remove 10ms timeout from TestWatch
This commit is contained in:
Tim Hockin 2014-08-05 10:02:43 -07:00
commit ace4e78a29
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/tools/etcd_tools_test.go
View File

@ -20,7 +20,6 @@ import (
"fmt"
"reflect"
"testing"
"time"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
"github.com/GoogleCloudPlatform/kubernetes/pkg/conversion"
@ -387,16 +386,12 @@ func TestWatch(t *testing.T) {
},
}
select {
case event := <-watching.ResultChan():
if e, a := watch.Added, event.Type; e != a {
t.Errorf("Expected %v, got %v", e, a)
}
if e, a := pod, event.Object; !reflect.DeepEqual(e, a) {
t.Errorf("Expected %v, got %v", e, a)
}
case <-time.After(10 * time.Millisecond):
t.Errorf("Expected 1 call but got 0")
event := <-watching.ResultChan()
if e, a := watch.Added, event.Type; e != a {
t.Errorf("Expected %v, got %v", e, a)
}
if e, a := pod, event.Object; !reflect.DeepEqual(e, a) {
t.Errorf("Expected %v, got %v", e, a)
}
// Test error case