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.

Merge pull request #28762 from lixiaobing10051267/masterToScheduler
897d2770 · k8s-merge-robot · GitHub · 39bfa168 · ce83c042 · 897d2770
Commit 897d2770 authored Jul 11, 2016 by k8s-merge-robot Committed by GitHub Jul 11, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

scheduler_interface_test.go plugin/pkg/scheduler/algorithm/scheduler_interface_test.go +1 -1

No files found.
--- a/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go
+++ b/plugin/pkg/scheduler/algorithm/scheduler_interface_test.go
@@ -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
 	}
 }