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

integration: fix force cluster test

Browse Source
This commit is contained in:
Xiang Li 2015-01-14 16:40:09 -08:00
parent 41a30ff21b
commit 8e8552b2ad
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
integration/cluster_test.go
View File

@ -144,7 +144,7 @@ func TestForceNewCluster(t *testing.T) {
cancel()
// ensure create has been applied in this machine
ctx, cancel = context.WithTimeout(context.Background(), requestTimeout)
if _, err := kapi.Watch("foo", resp.Node.ModifiedIndex).Next(ctx); err != nil {
if _, err := kapi.Watch("/foo", resp.Node.ModifiedIndex).Next(ctx); err != nil {
t.Fatalf("unexpected watch error: %v", err)
}
cancel()
@ -160,12 +160,11 @@ func TestForceNewCluster(t *testing.T) {
defer c.Members[0].Terminate(t)
// ensure force restart keep the old data, and new cluster can make progress
cc = mustNewHTTPClient(t, []string{c.Members[0].URL()})
kapi = client.NewKeysAPI(cc)
_, err = kapi.Get(context.TODO(), "/foo")
if err != nil {
t.Errorf("unexpected get error: %v", err)
ctx, cancel = context.WithTimeout(context.Background(), requestTimeout)
if _, err := kapi.Watch("/foo", resp.Node.ModifiedIndex).Next(ctx); err != nil {
t.Fatalf("unexpected watch error: %v", err)
}
cancel()
clusterMustProgress(t, c.Members[:1])
}