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

manual regist plugins to fix failure in multipoint unit tests

Browse Source 
Signed-off-by: kerthcet <kerthcet@gmail.com>
This commit is contained in:
kerthcet 2021-12-15 12:00:25 +08:00
parent 47463d777a
commit fcfa412270
1 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
pkg/scheduler/framework/runtime/framework_test.go
View File

@ -338,6 +338,8 @@ var registry = func() Registry {
r.Register(pluginNotImplementingScore, newPluginNotImplementingScore) r.Register(pluginNotImplementingScore, newPluginNotImplementingScore)
r.Register(duplicatePluginName, newDuplicatePlugin) r.Register(duplicatePluginName, newDuplicatePlugin)
r.Register(testPlugin, newTestPlugin) r.Register(testPlugin, newTestPlugin)
r.Register(queueSortPlugin, newQueueSortPlugin)
r.Register(bindPlugin, newBindPlugin)
return r return r
}() }()
@ -757,12 +759,19 @@ func TestNewFrameworkMultiPointExpansion(t *testing.T) {
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
fw, err := NewFramework(registry, &config.KubeSchedulerProfile{Plugins: tc.plugins}) fw, err := NewFramework(registry, &config.KubeSchedulerProfile{Plugins: tc.plugins})
if (err != nil && tc.wantErr == "") || (err == nil && tc.wantErr != "") || (err != nil && !strings.Contains(err.Error(), tc.wantErr)) { if err != nil {
t.Errorf("Unexpected error, got %v, expect: %s", err, tc.wantErr) if tc.wantErr == "" || !strings.Contains(err.Error(), tc.wantErr) {
t.Fatalf("Unexpected error, got %v, expect: %s", err, tc.wantErr)
}
} else {
if tc.wantErr != "" {
t.Fatalf("Unexpected error, got %v, expect: %s", err, tc.wantErr)
}
} }
if tc.wantErr == "" { if tc.wantErr == "" {
if diff := cmp.Diff(tc.wantPlugins, fw.ListPlugins()); diff != "" { if diff := cmp.Diff(tc.wantPlugins, fw.ListPlugins()); diff != "" {
t.Errorf("Unexpected eventToPlugin map (-want,+got):%s", diff) t.Fatalf("Unexpected eventToPlugin map (-want,+got):%s", diff)
} }
} }
}) })
@ -1083,6 +1092,33 @@ func TestRunScorePlugins(t *testing.T) {
}, },
err: true, err: true,
}, },
{
name: "single Score plugin with MultiPointExpansion",
plugins: &config.Plugins{
MultiPoint: config.PluginSet{
Enabled: []config.Plugin{
{Name: scorePlugin1},
},
},
Score: config.PluginSet{
Enabled: []config.Plugin{
{Name: scorePlugin1, Weight: 3},
},
},
},
pluginConfigs: []config.PluginConfig{
{
Name: scorePlugin1,
Args: &runtime.Unknown{
Raw: []byte(`{ "scoreRes": 1 }`),
},
},
},
// scorePlugin1 Score returns 1, weight=3, so want=3.
want: framework.PluginToNodeScores{
scorePlugin1: {{Name: "node1", Score: 3}, {Name: "node2", Score: 3}},
},
},
} }
for _, tt := range tests { for _, tt := range tests {
@ -1110,7 +1146,7 @@ func TestRunScorePlugins(t *testing.T) {
t.Errorf("Expected status to be success.") t.Errorf("Expected status to be success.")
} }
if !reflect.DeepEqual(res, tt.want) { if !reflect.DeepEqual(res, tt.want) {
t.Errorf("Score map after RunScorePlugin: %+v, want: %+v.", res, tt.want) t.Errorf("Score map after RunScorePlugin. got: %+v, want: %+v.", res, tt.want)
} }
}) })
} }