Merge pull request #1914 from smarterclayton/fix_pod_test_race

Sort of pods in test case was incorrect
This commit is contained in:
Dawn Chen 2014-10-20 14:52:29 -07:00
commit 0780e2839a

View File

@ -42,7 +42,10 @@ func (s sortedPods) Swap(i, j int) {
s[i], s[j] = s[j], s[i] s[i], s[j] = s[j], s[i]
} }
func (s sortedPods) Less(i, j int) bool { func (s sortedPods) Less(i, j int) bool {
return s[i].ID < s[j].ID && s[i].Namespace < s[j].Namespace if s[i].Namespace < s[j].Namespace {
return true
}
return s[i].ID < s[j].ID
} }
func CreateValidPod(name, namespace, source string) api.BoundPod { func CreateValidPod(name, namespace, source string) api.BoundPod {