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

Merge pull request #93629 from cofyc/93009

Browse Source 
fix flaky TestVolumeBinding unit test
This commit is contained in:
Kubernetes Prow Robot 2020-08-21 08:33:40 -07:00 committed by GitHub
commit 1c93be24ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkg/scheduler/framework/plugins/volumebinding/volume_binding_test.go
View File

@ -252,10 +252,7 @@ func TestVolumeBinding(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
// Start informer factory after initialization t.Log("Feed testing data and wait for them to be synced")
informerFactory.Start(ctx.Done())
// Feed testing data and wait for them to be synced
client.StorageV1().StorageClasses().Create(ctx, immediateSC, metav1.CreateOptions{}) client.StorageV1().StorageClasses().Create(ctx, immediateSC, metav1.CreateOptions{})
client.StorageV1().StorageClasses().Create(ctx, waitSC, metav1.CreateOptions{}) client.StorageV1().StorageClasses().Create(ctx, waitSC, metav1.CreateOptions{})
if item.node != nil { if item.node != nil {
@ -267,19 +264,21 @@ func TestVolumeBinding(t *testing.T) {
for _, pv := range item.pvs { for _, pv := range item.pvs {
client.CoreV1().PersistentVolumes().Create(ctx, pv, metav1.CreateOptions{}) client.CoreV1().PersistentVolumes().Create(ctx, pv, metav1.CreateOptions{})
} }
caches := informerFactory.WaitForCacheSync(ctx.Done())
for _, synced := range caches {
if !synced {
t.Errorf("error waiting for informer cache sync")
}
}
// Verify t.Log("Start informer factory after initialization")
informerFactory.Start(ctx.Done())
t.Log("Wait for all started informers' cache were synced")
informerFactory.WaitForCacheSync(ctx.Done())
t.Log("Verify")
p := pl.(*VolumeBinding) p := pl.(*VolumeBinding)
nodeInfo := framework.NewNodeInfo() nodeInfo := framework.NewNodeInfo()
nodeInfo.SetNode(item.node) nodeInfo.SetNode(item.node)
state := framework.NewCycleState() state := framework.NewCycleState()
t.Logf("call PreFilter and check status")
t.Logf("Verify: call PreFilter and check status")
gotPreFilterStatus := p.PreFilter(ctx, state, item.pod) gotPreFilterStatus := p.PreFilter(ctx, state, item.pod)
if !reflect.DeepEqual(gotPreFilterStatus, item.wantPreFilterStatus) { if !reflect.DeepEqual(gotPreFilterStatus, item.wantPreFilterStatus) {
t.Errorf("filter prefilter status does not match: %v, want: %v", gotPreFilterStatus, item.wantPreFilterStatus) t.Errorf("filter prefilter status does not match: %v, want: %v", gotPreFilterStatus, item.wantPreFilterStatus)
@ -288,7 +287,8 @@ func TestVolumeBinding(t *testing.T) {
// scheduler framework will skip Filter if PreFilter fails // scheduler framework will skip Filter if PreFilter fails
return return
} }
t.Logf("check state after prefilter phase")
t.Logf("Verify: check state after prefilter phase")
stateData, err := getStateData(state) stateData, err := getStateData(state)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -296,7 +296,8 @@ func TestVolumeBinding(t *testing.T) {
if !reflect.DeepEqual(stateData, item.wantStateAfterPreFilter) { if !reflect.DeepEqual(stateData, item.wantStateAfterPreFilter) {
t.Errorf("state got after prefilter does not match: %v, want: %v", stateData, item.wantStateAfterPreFilter) t.Errorf("state got after prefilter does not match: %v, want: %v", stateData, item.wantStateAfterPreFilter)
} }
t.Logf("call Filter and check status")
t.Logf("Verify: call Filter and check status")
gotStatus := p.Filter(ctx, state, item.pod, nodeInfo) gotStatus := p.Filter(ctx, state, item.pod, nodeInfo)
if !reflect.DeepEqual(gotStatus, item.wantFilterStatus) { if !reflect.DeepEqual(gotStatus, item.wantFilterStatus) {
t.Errorf("filter status does not match: %v, want: %v", gotStatus, item.wantFilterStatus) t.Errorf("filter status does not match: %v, want: %v", gotStatus, item.wantFilterStatus)