Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6438 from gyuho/e2e-backends

Browse Source 
e2e: rename 'backends' to 'processes'
This commit is contained in:
Gyu-Ho Lee 2016-09-15 19:00:28 +09:00 committed by GitHub
commit 9913e0073c
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
e2e/ctl_v2_test.go
View File

@ -316,9 +316,9 @@ func etcdctlPrefixArgs(clus *etcdProcessCluster) []string {
endpoints := ""
if proxies := clus.proxies(); len(proxies) != 0 {
endpoints = proxies[0].cfg.acurl
} else if backends := clus.backends(); len(backends) != 0 {
} else if processes := clus.processes(); len(processes) != 0 {
es := []string{}
for _, b := range backends {
for _, b := range processes {
es = append(es, b.cfg.acurl)
}
endpoints = strings.Join(es, ",")

4
e2e/ctl_v3_snapshot_test.go
View File

@ -167,7 +167,7 @@ func TestIssue6361(t *testing.T) {
t.Fatal(err)
}
if err = epc.backends()[0].Stop(); err != nil {
if err = epc.processes()[0].Stop(); err != nil {
t.Fatal(err)
}
@ -187,7 +187,7 @@ func TestIssue6361(t *testing.T) {
epc.procs[0].cfg.args[i+1] = newDataDir
}
}
if err = epc.backends()[0].Restart(); err != nil {
if err = epc.processes()[0].Restart(); err != nil {
t.Fatal(err)
}

6
e2e/etcd_test.go
View File

@ -528,13 +528,13 @@ func (epc *etcdProcessCluster) proxies() []*etcdProcess {
return epc.procs[epc.cfg.clusterSize:]
}
func (epc *etcdProcessCluster) backends() []*etcdProcess {
func (epc *etcdProcessCluster) processes() []*etcdProcess {
return epc.procs[:epc.cfg.clusterSize]
}
func (epc *etcdProcessCluster) endpoints() []string {
eps := make([]string, epc.cfg.clusterSize)
for i, ep := range epc.backends() {
for i, ep := range epc.processes() {
eps[i] = ep.cfg.acurl
}
return eps
@ -542,7 +542,7 @@ func (epc *etcdProcessCluster) endpoints() []string {
func (epc *etcdProcessCluster) grpcEndpoints() []string {
eps := make([]string, epc.cfg.clusterSize)
for i, ep := range epc.backends() {
for i, ep := range epc.processes() {
eps[i] = ep.cfg.acurlHost
}
return eps