scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19226 from wojtek-t/fix_test_poll

Browse Source 
Fix TestPoll test
This commit is contained in:
Wojciech Tyczynski
2016-01-02 17:12:20 +01:00
parent b4189f965e 84e2d6c3d3
commit ab58e72333
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/util/wait/wait_test.go
View File

@@ -84,7 +84,7 @@ func TestPoll(t *testing.T) {
return true, nil
})
fp := fakePoller{max: 1}
if err := pollInternal(fp.GetWaitFunc(time.Microsecond, time.Microsecond), f); err != nil {
if err := pollInternal(fp.GetWaitFunc(time.Microsecond, time.Second), f); err != nil {
t.Fatalf("unexpected error %v", err)
}
if invocations != 1 {
@@ -94,19 +94,18 @@ func TestPoll(t *testing.T) {
if used != 1 {
t.Errorf("Expected exactly one tick, got %d", used)
}
}
func TestPollError(t *testing.T) {
expectedError := errors.New("Expected error")
f = ConditionFunc(func() (bool, error) {
f := ConditionFunc(func() (bool, error) {
return false, expectedError
})
fp = fakePoller{max: 1}
if err := pollInternal(fp.GetWaitFunc(time.Microsecond, time.Microsecond), f); err == nil || err != expectedError {
fp := fakePoller{max: 1}
if err := pollInternal(fp.GetWaitFunc(time.Microsecond, time.Second), f); err == nil || err != expectedError {
t.Fatalf("Expected error %v, got none %v", expectedError, err)
}
if invocations != 1 {
t.Errorf("Expected exactly one invocation, got %d", invocations)
}
used = atomic.LoadInt32(&fp.used)
used := atomic.LoadInt32(&fp.used)
if used != 1 {
t.Errorf("Expected exactly one tick, got %d", used)
}