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

clientv3/integration: wait for leader before trying to count watches

Browse Source 
Fixes #8044
This commit is contained in:
Anthony Romano 2017-06-22 15:02:41 -07:00
parent f7df3c80d5
commit 9e574afb84
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clientv3/integration/watch_test.go
View File

@ -856,6 +856,20 @@ func TestWatchCancelOnServer(t *testing.T) {
client := cluster.RandClient() client := cluster.RandClient()
numWatches := 10 numWatches := 10
// grpcproxy starts watches to detect leadership after the proxy server
// returns as started; to avoid racing on the proxy's internal watches, wait
// until require leader watches get create responses to ensure the leadership
// watches have started.
for {
ctx, cancel := context.WithCancel(clientv3.WithRequireLeader(context.TODO()))
ww := client.Watch(ctx, "a", clientv3.WithCreatedNotify())
wresp := <-ww
cancel()
if wresp.Err() == nil {
break
}
}
cancels := make([]context.CancelFunc, numWatches) cancels := make([]context.CancelFunc, numWatches)
for i := 0; i < numWatches; i++ { for i := 0; i < numWatches; i++ {
// use WithTimeout to force separate streams in client // use WithTimeout to force separate streams in client
@ -885,7 +899,7 @@ func TestWatchCancelOnServer(t *testing.T) {
t.Fatalf("expected n=2 and err=nil, got n=%d and err=%v", n, serr) t.Fatalf("expected n=2 and err=nil, got n=%d and err=%v", n, serr)
} }
if maxWatchV-minWatchV != numWatches { if maxWatchV-minWatchV < numWatches {
t.Fatalf("expected %d canceled watchers, got %d", numWatches, maxWatchV-minWatchV) t.Fatalf("expected %d canceled watchers, got %d", numWatches, maxWatchV-minWatchV)
} }
} }