Fix LP 1299958

Fix LP 1299958

Assert that the set of [][]instance.HostPorts contains the currect set by sorting the top level of slices of slices of instance.HostPorts but leaving the order of the seceond level untouched.

https://code.launchpad.net/~dave-cheney/juju-core/129-fix-lp-1299958/+merge/215107

(do not edit description out of merge proposal)

[dave_cheney.net, 2014-04-10 08:40:54]

Please take a look.

[dave_cheney.net, 2014-04-10 08:46:41]

Please take a look.

[rog, 2014-04-10 08:58:02]

LGTM with the comparison function fixed.

https://codereview.appspot.com/86400043/diff/1/worker/peergrouper/desired_tes...
File worker/peergrouper/desired_test.go (right):

https://codereview.appspot.com/86400043/diff/1/worker/peergrouper/desired_tes...
worker/peergrouper/desired_test.go:434: a, b := h[i], h[j]
These comparisons don't look right to me.
I think you want:

if len(a) != len(b) {
    return len(a) < len(b)
}
for i := range a {
    av, bv := a[i], b[i]
    if av.Value != bv.Value {
        return av.Value < bv.Value
    }
    if av.Port != bv.Port {
        return av.Port < bv.Port
    }
}
return false

https://codereview.appspot.com/86400043/diff/1/worker/peergrouper/desired_tes...
worker/peergrouper/desired_test.go:439: if a[i].Address.Value <
b[i].Address.Value || a[i].Port < b[i].Port {
s/\.Address//g

(it's embedded)

[dave_cheney.net, 2014-04-10 09:01:54]

Please take a look.

[rog, 2014-04-10 09:02:32]

https://codereview.appspot.com/86400043/diff/1/worker/peergrouper/desired_tes...
File worker/peergrouper/desired_test.go (right):

https://codereview.appspot.com/86400043/diff/1/worker/peergrouper/desired_tes...
worker/peergrouper/desired_test.go:428: // hostPortSliceByHostPort sorts a slice
of as slice of instance.HostPort values.
s/slice of as slice/slice of slices/
?

[dave_cheney.net, 2014-04-10 09:07:02]

Please take a look.