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

etcd: reorganize etce_start test

Browse Source
This commit is contained in:
Xiang Li 2014-07-22 21:34:23 -07:00 committed by Yicheng Qin
parent 93104f114e
commit b652a0d232
1 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
etcd/etcd_start_test.go
View File

@ -71,30 +71,6 @@ func TestBadDiscoveryService(t *testing.T) {
} }
} }
func TestRunByAdvisedPeers(t *testing.T) {
es, hs := buildCluster(1, false)
waitCluster(t, es)
c := config.New()
c.Peers = []string{hs[0].URL}
e, h, err := buildServer(c, bootstrapId)
if err != nil {
t.Fatalf("build server err = %v, want nil", err)
}
w := es[0].id
if g, _ := waitLeader(append(es, e)); g != w {
t.Errorf("leader = %d, want %d", g, w)
}
destroyServer(e, h)
for i := range hs {
es[len(hs)-i-1].Stop()
}
for i := range hs {
hs[len(hs)-i-1].Close()
}
}
func TestBadDiscoveryServiceWithAdvisedPeers(t *testing.T) { func TestBadDiscoveryServiceWithAdvisedPeers(t *testing.T) {
g := garbageHandler{t: t} g := garbageHandler{t: t}
ts := httptest.NewServer(&g) ts := httptest.NewServer(&g)
@ -134,6 +110,30 @@ func TestBootstrapByDiscoveryService(t *testing.T) {
destroyServer(de, dh) destroyServer(de, dh)
} }
func TestRunByAdvisedPeers(t *testing.T) {
es, hs := buildCluster(1, false)
waitCluster(t, es)
c := config.New()
c.Peers = []string{hs[0].URL}
e, h, err := buildServer(c, bootstrapId)
if err != nil {
t.Fatalf("build server err = %v, want nil", err)
}
w := es[0].id
if g, _ := waitLeader(append(es, e)); g != w {
t.Errorf("leader = %d, want %d", g, w)
}
destroyServer(e, h)
for i := range hs {
es[len(hs)-i-1].Stop()
}
for i := range hs {
hs[len(hs)-i-1].Close()
}
}
func TestRunByDiscoveryService(t *testing.T) { func TestRunByDiscoveryService(t *testing.T) {
de, dh, _ := buildServer(config.New(), genId()) de, dh, _ := buildServer(config.New(), genId())