|
@@ -3,6 +3,8 @@ package etcd
|
|
|
import (
|
|
import (
|
|
|
"io/ioutil"
|
|
"io/ioutil"
|
|
|
"net/http"
|
|
"net/http"
|
|
|
|
|
+ "reflect"
|
|
|
|
|
+ "sort"
|
|
|
"strings"
|
|
"strings"
|
|
|
"testing"
|
|
"testing"
|
|
|
)
|
|
)
|
|
@@ -11,11 +13,10 @@ func TestMachinesEndPoint(t *testing.T) {
|
|
|
es, hs := buildCluster(3)
|
|
es, hs := buildCluster(3)
|
|
|
waitCluster(t, es)
|
|
waitCluster(t, es)
|
|
|
|
|
|
|
|
- us := make([]string, len(hs))
|
|
|
|
|
|
|
+ w := make([]string, len(hs))
|
|
|
for i := range hs {
|
|
for i := range hs {
|
|
|
- us[i] = hs[i].URL
|
|
|
|
|
|
|
+ w[i] = hs[i].URL
|
|
|
}
|
|
}
|
|
|
- w := strings.Join(us, ",")
|
|
|
|
|
|
|
|
|
|
for i := range hs {
|
|
for i := range hs {
|
|
|
r, err := http.Get(hs[i].URL + v2machinePrefix)
|
|
r, err := http.Get(hs[i].URL + v2machinePrefix)
|
|
@@ -29,8 +30,10 @@ func TestMachinesEndPoint(t *testing.T) {
|
|
|
t.Errorf("%v", err)
|
|
t.Errorf("%v", err)
|
|
|
break
|
|
break
|
|
|
}
|
|
}
|
|
|
- if string(b) != w {
|
|
|
|
|
- t.Errorf("machines = %v, want %v", string(b), w)
|
|
|
|
|
|
|
+ g := strings.Split(string(b), ",")
|
|
|
|
|
+ sort.Strings(g)
|
|
|
|
|
+ if !reflect.DeepEqual(w, g) {
|
|
|
|
|
+ t.Errorf("machines = %v, want %v", g, w)
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|