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 #4248 from gyuho/rest_of_unsynced_test

Browse Source 
integration: add more tests for unsynced watch
This commit is contained in:
Gyu-Ho Lee 2016-01-20 12:32:08 -08:00
commit d26b1460c5
1 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
integration/v3_grpc_test.go
View File

@ -483,11 +483,19 @@ func testV3WatchCancel(t *testing.T, startRev int64) {
clus.Terminate(t) clus.Terminate(t)
} }
// TestV3WatchMultiple tests multiple watchers on the same key func TestV3WatchMultipleWatchersSynced(t *testing.T) {
testV3WatchMultipleWatchers(t, 0)
}
func TestV3WatchMultipleWatchersUnsynced(t *testing.T) {
testV3WatchMultipleWatchers(t, 1)
}
// testV3WatchMultipleWatchers tests multiple watchers on the same key
// and one watcher with matching prefix. It first puts the key // and one watcher with matching prefix. It first puts the key
// that matches all watchers, and another key that matches only // that matches all watchers, and another key that matches only
// one watcher to test if it receives expected events. // one watcher to test if it receives expected events.
func TestV3WatchMultiple(t *testing.T) { func testV3WatchMultipleWatchers(t *testing.T, startRev int64) {
clus := newClusterGRPC(t, &clusterConfig{size: 3}) clus := newClusterGRPC(t, &clusterConfig{size: 3})
wAPI := pb.NewWatchClient(clus.RandConn()) wAPI := pb.NewWatchClient(clus.RandConn())
kvc := pb.NewKVClient(clus.RandConn()) kvc := pb.NewKVClient(clus.RandConn())
@ -501,9 +509,9 @@ func TestV3WatchMultiple(t *testing.T) {
for i := 0; i < watchKeyN+1; i++ { for i := 0; i < watchKeyN+1; i++ {
var wreq *pb.WatchRequest var wreq *pb.WatchRequest
if i < watchKeyN { if i < watchKeyN {
wreq = &pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Key: []byte("foo")}} wreq = &pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Key: []byte("foo"), StartRevision: startRev}}
} else { } else {
wreq = &pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Prefix: []byte("fo")}} wreq = &pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Prefix: []byte("fo"), StartRevision: startRev}}
} }
if err := wStream.Send(wreq); err != nil { if err := wStream.Send(wreq); err != nil {
t.Fatalf("wStream.Send error: %v", err) t.Fatalf("wStream.Send error: %v", err)
@ -573,9 +581,16 @@ func TestV3WatchMultiple(t *testing.T) {
clus.Terminate(t) clus.Terminate(t)
} }
// TestV3WatchMultipleEventsFromCurrentRevision tests Watch APIs from current revision func TestV3WatchMultipleEventsTxnSynced(t *testing.T) {
// in cases it receives multiple events. testV3WatchMultipleEventsTxn(t, 0)
func TestV3WatchMultipleEventsFromCurrentRevision(t *testing.T) { }
func TestV3WatchMultipleEventsTxnUnsynced(t *testing.T) {
testV3WatchMultipleEventsTxn(t, 1)
}
// testV3WatchMultipleEventsTxn tests Watch APIs when it receives multiple events.
func testV3WatchMultipleEventsTxn(t *testing.T, startRev int64) {
clus := newClusterGRPC(t, &clusterConfig{size: 3}) clus := newClusterGRPC(t, &clusterConfig{size: 3})
wAPI := pb.NewWatchClient(clus.RandConn()) wAPI := pb.NewWatchClient(clus.RandConn())
@ -584,7 +599,7 @@ func TestV3WatchMultipleEventsFromCurrentRevision(t *testing.T) {
t.Fatalf("wAPI.Watch error: %v", wErr) t.Fatalf("wAPI.Watch error: %v", wErr)
} }
if err := wStream.Send(&pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Prefix: []byte("foo")}}); err != nil { if err := wStream.Send(&pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Prefix: []byte("foo"), StartRevision: startRev}}); err != nil {
t.Fatalf("wStream.Send error: %v", err) t.Fatalf("wStream.Send error: %v", err)
} }
@ -651,8 +666,16 @@ func (evs eventsSortByKey) Len() int { return len(evs) }
func (evs eventsSortByKey) Swap(i, j int) { evs[i], evs[j] = evs[j], evs[i] } func (evs eventsSortByKey) Swap(i, j int) { evs[i], evs[j] = evs[j], evs[i] }
func (evs eventsSortByKey) Less(i, j int) bool { return bytes.Compare(evs[i].Kv.Key, evs[j].Kv.Key) < 0 } func (evs eventsSortByKey) Less(i, j int) bool { return bytes.Compare(evs[i].Kv.Key, evs[j].Kv.Key) < 0 }
// TestV3WatchMultipleStreams tests multiple watchers on the same key on multiple streams. func TestV3WatchMultipleStreamsSynced(t *testing.T) {
func TestV3WatchMultipleStreams(t *testing.T) { testV3WatchMultipleStreams(t, 0)
}
func TestV3WatchMultipleStreamsUnsynced(t *testing.T) {
testV3WatchMultipleStreams(t, 1)
}
// testV3WatchMultipleStreams tests multiple watchers on the same key on multiple streams.
func testV3WatchMultipleStreams(t *testing.T, startRev int64) {
clus := newClusterGRPC(t, &clusterConfig{size: 3}) clus := newClusterGRPC(t, &clusterConfig{size: 3})
wAPI := pb.NewWatchClient(clus.RandConn()) wAPI := pb.NewWatchClient(clus.RandConn())
kvc := pb.NewKVClient(clus.RandConn()) kvc := pb.NewKVClient(clus.RandConn())
@ -663,7 +686,7 @@ func TestV3WatchMultipleStreams(t *testing.T) {
if errW != nil { if errW != nil {
t.Fatalf("wAPI.Watch error: %v", errW) t.Fatalf("wAPI.Watch error: %v", errW)
} }
if err := wStream.Send(&pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Key: []byte("foo")}}); err != nil { if err := wStream.Send(&pb.WatchRequest{CreateRequest: &pb.WatchCreateRequest{Key: []byte("foo"), StartRevision: startRev}}); err != nil {
t.Fatalf("wStream.Send error: %v", err) t.Fatalf("wStream.Send error: %v", err)
} }
streams[i] = wStream streams[i] = wStream