From 20776f1947eb63ca055d1ee5bc9a4da409d189a2 Mon Sep 17 00:00:00 2001 From: Jonathan Boulle Date: Thu, 11 Sep 2014 19:17:07 -0700 Subject: [PATCH] etcdserver: use int64slice directly --- etcdserver/etcdhttp/peers_test.go | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/etcdserver/etcdhttp/peers_test.go b/etcdserver/etcdhttp/peers_test.go index e3433ac7e..4942fd006 100644 --- a/etcdserver/etcdhttp/peers_test.go +++ b/etcdserver/etcdhttp/peers_test.go @@ -47,10 +47,10 @@ func TestPeers(t *testing.T) { if err != nil { t.Errorf("#%d: err=%v, want nil", i, err) } - ids := p.IDs() - sortint64(ids) - if !reflect.DeepEqual(ids, tt.wids) { - t.Errorf("#%d: IDs=%#v, want %#v", i, ids, tt.wids) + ids := int64Slice(p.IDs()) + sort.Sort(ids) + if !reflect.DeepEqual([]int64(ids), tt.wids) { + t.Errorf("#%d: IDs=%#v, want %#v", i, []int64(ids), tt.wids) } ep := p.Endpoints() if !reflect.DeepEqual(ep, tt.wep) { @@ -69,17 +69,6 @@ func (p int64Slice) Len() int { return len(p) } func (p int64Slice) Less(i, j int) bool { return p[i] < p[j] } func (p int64Slice) Swap(i, j int) { p[i], p[j] = p[j], p[i] } -func sortint64(list []int64) { - sorted := make(int64Slice, len(list)) - for i, j := range list { - sorted[i] = j - } - sort.Sort(sorted) - for i, j := range sorted { - list[i] = j - } -} - func TestPeersSetBad(t *testing.T) { tests := []string{ // garbage URL