Merge pull request #4695 from gyuho/endpoints

e2e: use endpoints flag
This commit is contained in:
Gyu-Ho Lee 2016-03-05 13:00:00 -08:00
commit b83b5307d1

View File

@ -15,6 +15,7 @@
package e2e
import (
"strings"
"testing"
"time"
@ -214,13 +215,17 @@ func testCtlV2GetRoleUser(t *testing.T, cfg *etcdProcessClusterConfig) {
}
func etcdctlPrefixArgs(clus *etcdProcessCluster, noSync bool) []string {
endpoint := ""
endpoints := ""
if proxies := clus.proxies(); len(proxies) != 0 {
endpoint = proxies[0].cfg.acurl.String()
endpoints = proxies[0].cfg.acurl.String()
} else if backends := clus.backends(); len(backends) != 0 {
endpoint = backends[0].cfg.acurl.String()
es := []string{}
for _, b := range backends {
es = append(es, b.cfg.acurl.String())
}
endpoints = strings.Join(es, ",")
}
cmdArgs := []string{"../bin/etcdctl", "--endpoint", endpoint}
cmdArgs := []string{"../bin/etcdctl", "--endpoints", endpoints}
if noSync {
cmdArgs = append(cmdArgs, "--no-sync")
}