Merge pull request #28762 from lixiaobing10051267/masterToScheduler

Automatic merge from submit-queue

Error info "scheduler" modify

File "plugin\pkg\scheduler\algorithm\scheduler_interface_test.go“, line 49, "st.t.Errorf("Unexpected error %v\nTried to scheduler: %#v", err, pod)", here "scheduler" should be "schedule" because it is to schedule pod.
This commit is contained in:
k8s-merge-robot 2016-07-11 03:30:34 -07:00 committed by GitHub
commit 897d277095

View File

@ -46,7 +46,7 @@ func (st *schedulerTester) expectSchedule(pod *api.Pod, expected string) {
func (st *schedulerTester) expectSuccess(pod *api.Pod) {
_, err := st.scheduler.Schedule(pod, st.nodeLister)
if err != nil {
st.t.Errorf("Unexpected error %v\nTried to scheduler: %#v", err, pod)
st.t.Errorf("Unexpected error %v\nTried to schedule: %#v", err, pod)
return
}
}