github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 10:20:51 +00:00
Code Issues Projects Releases Wiki Activity

always run filter in test

Browse Source
This commit is contained in:
kidddddddddddddddddddddd 2023-01-08 11:12:51 +08:00
parent 0abdf6abc2
commit 733d5695f2
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkg/scheduler/framework/plugins/volumezone/volume_zone_test.go
View File

@ -230,16 +230,13 @@ func TestSingleZone(t *testing.T) {
pvcLister, pvcLister,
nil, nil,
} }
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod) _, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" { if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("PreFilter: status does not match (-want,+got):\n%s", diff)
} }
if preFilterStatus.IsSuccess() {
filterStatus := p.Filter(ctx, state, test.Pod, node) filterStatus := p.Filter(ctx, state, test.Pod, node)
if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" { if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("Filter: status does not match (-want,+got):\n%s", diff)
}
} }
}) })
} }
@ -366,13 +363,11 @@ func TestMultiZone(t *testing.T) {
} }
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod) _, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" { if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("PreFilter: status does not match (-want,+got):\n%s", diff)
} }
if preFilterStatus.IsSuccess() { filterStatus := p.Filter(ctx, state, test.Pod, node)
filterStatus := p.Filter(context.Background(), state, test.Pod, node)
if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" { if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("Filter: status does not match (-want,+got):\n%s", diff)
}
} }
}) })
} }
@ -450,6 +445,8 @@ func TestWithBinding(t *testing.T) {
Node: testNode, Node: testNode,
wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable,
"PersistentVolumeClaim had no pv name and storageClass name"), "PersistentVolumeClaim had no pv name and storageClass name"),
wantFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable,
"PersistentVolumeClaim had no pv name and storageClass name"),
}, },
{ {
name: "unbound volume no storage class", name: "unbound volume no storage class",
@ -457,12 +454,15 @@ func TestWithBinding(t *testing.T) {
Node: testNode, Node: testNode,
wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable,
"unable to find storage class: Class_0"), "unable to find storage class: Class_0"),
wantFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable,
"unable to find storage class: Class_0"),
}, },
{ {
name: "unbound volume immediate binding mode", name: "unbound volume immediate binding mode",
Pod: createPodWithVolume("pod_1", "vol_1", "PVC_ImmediateSC"), Pod: createPodWithVolume("pod_1", "vol_1", "PVC_ImmediateSC"),
Node: testNode, Node: testNode,
wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, "VolumeBindingMode not set for StorageClass \"Class_Immediate\""), wantPreFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, "VolumeBindingMode not set for StorageClass \"Class_Immediate\""),
wantFilterStatus: framework.NewStatus(framework.UnschedulableAndUnresolvable, "VolumeBindingMode not set for StorageClass \"Class_Immediate\""),
}, },
{ {
name: "unbound volume wait binding mode", name: "unbound volume wait binding mode",
@ -487,13 +487,11 @@ func TestWithBinding(t *testing.T) {
} }
_, preFilterStatus := p.PreFilter(ctx, state, test.Pod) _, preFilterStatus := p.PreFilter(ctx, state, test.Pod)
if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" { if diff := cmp.Diff(preFilterStatus, test.wantPreFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("PreFilter: status does not match (-want,+got):\n%s", diff)
} }
if preFilterStatus.IsSuccess() {
filterStatus := p.Filter(ctx, state, test.Pod, node) filterStatus := p.Filter(ctx, state, test.Pod, node)
if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" { if diff := cmp.Diff(filterStatus, test.wantFilterStatus); diff != "" {
t.Errorf("status does not match (-want,+got):\n%s", diff) t.Errorf("Filter: status does not match (-want,+got):\n%s", diff)
}
} }
}) })
} }