mirror of https://github.com/k3s-io/k3s
Merge pull request #66671 from hanxiaoshuai/cleanup07261
Automatic merge from submit-queue (batch tested with PRs 63955, 66685, 66671). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. remove unused code in pkg/scheduler/algorithm/scheduler_interface_test.go **What this PR does / why we need it**: remove unused code in pkg/scheduler/algorithm/scheduler_interface_test.go **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```pull/8/head
commit
0e9b1dd20f
|
@ -28,10 +28,7 @@ go_library(
|
||||||
|
|
||||||
go_test(
|
go_test(
|
||||||
name = "go_default_test",
|
name = "go_default_test",
|
||||||
srcs = [
|
srcs = ["types_test.go"],
|
||||||
"scheduler_interface_test.go",
|
|
||||||
"types_test.go",
|
|
||||||
],
|
|
||||||
embed = [":go_default_library"],
|
embed = [":go_default_library"],
|
||||||
deps = [
|
deps = [
|
||||||
"//pkg/scheduler/cache:go_default_library",
|
"//pkg/scheduler/cache:go_default_library",
|
||||||
|
|
|
@ -1,60 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright 2014 The Kubernetes Authors.
|
|
||||||
|
|
||||||
Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
you may not use this file except in compliance with the License.
|
|
||||||
You may obtain a copy of the License at
|
|
||||||
|
|
||||||
http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
|
|
||||||
Unless required by applicable law or agreed to in writing, software
|
|
||||||
distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
See the License for the specific language governing permissions and
|
|
||||||
limitations under the License.
|
|
||||||
*/
|
|
||||||
|
|
||||||
package algorithm
|
|
||||||
|
|
||||||
import (
|
|
||||||
"testing"
|
|
||||||
|
|
||||||
"k8s.io/api/core/v1"
|
|
||||||
)
|
|
||||||
|
|
||||||
// Some functions used by multiple scheduler tests.
|
|
||||||
|
|
||||||
type schedulerTester struct {
|
|
||||||
t *testing.T
|
|
||||||
scheduler ScheduleAlgorithm
|
|
||||||
nodeLister NodeLister
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call if you know exactly where pod should get scheduled.
|
|
||||||
func (st *schedulerTester) expectSchedule(pod *v1.Pod, expected string) {
|
|
||||||
actual, err := st.scheduler.Schedule(pod, st.nodeLister)
|
|
||||||
if err != nil {
|
|
||||||
st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if actual != expected {
|
|
||||||
st.t.Errorf("Unexpected scheduling value: %v, expected %v", actual, expected)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call if you can't predict where pod will be scheduled.
|
|
||||||
func (st *schedulerTester) expectSuccess(pod *v1.Pod) {
|
|
||||||
_, err := st.scheduler.Schedule(pod, st.nodeLister)
|
|
||||||
if err != nil {
|
|
||||||
st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Call if pod should *not* schedule.
|
|
||||||
func (st *schedulerTester) expectFailure(pod *v1.Pod) {
|
|
||||||
_, err := st.scheduler.Schedule(pod, st.nodeLister)
|
|
||||||
if err == nil {
|
|
||||||
st.t.Error("Unexpected non-error")
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue