github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #93896 from alculquicondor/speed-up-volume-binding-test

Browse Source 
Improve running time of TestSchedulerWithVolumeBinding
This commit is contained in:
Kubernetes Prow Robot 2020-08-26 19:41:10 -07:00 committed by GitHub
commit 06eb495a0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/scheduler/scheduler_test.go
View File

@ -995,28 +995,26 @@ func TestSchedulerWithVolumeBinding(t *testing.T) {
t.Fatalf("scheduling timeout after %v", wait.ForeverTestTimeout) t.Fatalf("scheduling timeout after %v", wait.ForeverTestTimeout)
} }
stopFunc() stopFunc()
// Wait for scheduling to return an error // Wait for scheduling to return an error or succeed binding.
var (
gotErr error
gotBind *v1.Binding
)
select { select {
case err := <-errChan: case gotErr = <-errChan:
if item.expectError == nil || !reflect.DeepEqual(item.expectError.Error(), err.Error()) { case gotBind = <-bindingChan:
t.Errorf("err \nWANT=%+v,\nGOT=%+v", item.expectError, err)
}
case <-time.After(chanTimeout): case <-time.After(chanTimeout):
if item.expectError != nil { t.Fatalf("did not receive pod binding or error after %v", chanTimeout)
t.Errorf("did not receive error after %v", chanTimeout)
}
} }
if item.expectError != nil {
// Wait for pod to succeed binding if gotErr == nil || item.expectError.Error() != gotErr.Error() {
select { t.Errorf("err \nWANT=%+v,\nGOT=%+v", item.expectError, gotErr)
case b := <-bindingChan:
if !reflect.DeepEqual(item.expectPodBind, b) {
t.Errorf("err \nWANT=%+v,\nGOT=%+v", item.expectPodBind, b)
}
case <-time.After(chanTimeout):
if item.expectPodBind != nil {
t.Errorf("did not receive pod binding after %v", chanTimeout)
} }
} else if gotErr != nil {
t.Errorf("err \nWANT=%+v,\nGOT=%+v", item.expectError, gotErr)
}
if !cmp.Equal(item.expectPodBind, gotBind) {
t.Errorf("err \nWANT=%+v,\nGOT=%+v", item.expectPodBind, gotBind)
} }
if item.expectAssumeCalled != fakeVolumeBinder.AssumeCalled { if item.expectAssumeCalled != fakeVolumeBinder.AssumeCalled {