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: wait for slow travis

Browse Source
This commit is contained in:
Xiang Li 2015-02-13 10:45:11 -08:00
parent c16cc3a6a3
commit 163ea3f5c5
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
integration/cluster_test.go
View File

@ -547,6 +547,24 @@ func (m *member) Launch() error {
return nil return nil
} }
func (m *member) WaitOK(t *testing.T) {
cc := mustNewHTTPClient(t, []string{m.URL()})
kapi := client.NewKeysAPI(cc)
for {
ctx, cancel := context.WithTimeout(context.Background(), requestTimeout)
_, err := kapi.Get(ctx, "/")
if err != nil {
time.Sleep(tickDuration)
continue
}
cancel()
break
}
for m.s.Leader() == 0 {
time.Sleep(tickDuration)
}
}
func (m *member) URL() string { return m.ClientURLs[0].String() } func (m *member) URL() string { return m.ClientURLs[0].String() }
func (m *member) Pause() { func (m *member) Pause() {

7
integration/member_test.go
View File

@ -86,6 +86,7 @@ func TestSnapshotAndRestartMember(t *testing.T) {
m.SnapCount = 100 m.SnapCount = 100
m.Launch() m.Launch()
defer m.Terminate(t) defer m.Terminate(t)
m.WaitOK(t)
resps := make([]*client.Response, 120) resps := make([]*client.Response, 120)
var err error var err error
@ -96,7 +97,7 @@ func TestSnapshotAndRestartMember(t *testing.T) {
key := fmt.Sprintf("foo%d", i) key := fmt.Sprintf("foo%d", i)
resps[i], err = kapi.Create(ctx, "/"+key, "bar", -1) resps[i], err = kapi.Create(ctx, "/"+key, "bar", -1)
if err != nil { if err != nil {
t.Fatalf("create on %s error: %v", m.URL(), err) t.Fatalf("#%d: create on %s error: %v", i, m.URL(), err)
} }
cancel() cancel()
} }
@ -110,12 +111,12 @@ func TestSnapshotAndRestartMember(t *testing.T) {
key := fmt.Sprintf("foo%d", i) key := fmt.Sprintf("foo%d", i)
resp, err := kapi.Get(ctx, "/"+key) resp, err := kapi.Get(ctx, "/"+key)
if err != nil { if err != nil {
t.Fatalf("get on %s error: %v", m.URL(), err) t.Fatalf("#%d: get on %s error: %v", i, m.URL(), err)
} }
cancel() cancel()
if !reflect.DeepEqual(resp.Node, resps[i].Node) { if !reflect.DeepEqual(resp.Node, resps[i].Node) {
t.Errorf("#%d: node = %v, want %v", resp.Node, resps[i].Node) t.Errorf("#%d: node = %v, want %v", i, resp.Node, resps[i].Node)
} }
} }
} }