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 #16888 from greenmoon55/greenmoon55-patch-1

Browse Source 
tests: add comments for clientv3test.TestWatchResumeInitRev
This commit is contained in:
Benjamin Wang 2023-12-16 20:35:43 +00:00 committed by GitHub
commit f7be2dfa17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/integration/clientv3/watch_test.go
View File

@ -350,7 +350,9 @@ func putAndWatch(t *testing.T, wctx *watchctx, key, val string) {
} }
} }
func TestWatchResumeInitRev(t *testing.T) { // TestWatchResumeAfterDisconnect tests watch resume after member disconnects then connects.
// It ensures that correct events are returned corresponding to the start revision.
func TestWatchResumeAfterDisconnect(t *testing.T) {
integration2.BeforeTest(t) integration2.BeforeTest(t)
clus := integration2.NewCluster(t, &integration2.ClusterConfig{Size: 1, UseBridge: true}) clus := integration2.NewCluster(t, &integration2.ClusterConfig{Size: 1, UseBridge: true})
defer clus.Terminate(t) defer clus.Terminate(t)
@ -367,7 +369,10 @@ func TestWatchResumeInitRev(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
// watch from revision 1
wch := clus.Client(0).Watch(context.Background(), "a", clientv3.WithRev(1), clientv3.WithCreatedNotify()) wch := clus.Client(0).Watch(context.Background(), "a", clientv3.WithRev(1), clientv3.WithCreatedNotify())
// response for the create watch request, no events are in this response
// the current revision of etcd should be 4
if resp, ok := <-wch; !ok || resp.Header.Revision != 4 { if resp, ok := <-wch; !ok || resp.Header.Revision != 4 {
t.Fatalf("got (%v, %v), expected create notification rev=4", resp, ok) t.Fatalf("got (%v, %v), expected create notification rev=4", resp, ok)
} }
@ -389,12 +394,16 @@ func TestWatchResumeInitRev(t *testing.T) {
if !ok { if !ok {
t.Fatal("unexpected watch close") t.Fatal("unexpected watch close")
} }
if len(resp.Events) == 0 { // Events should be put(a, 3) and put(a, 4)
t.Fatal("expected event on watch") if len(resp.Events) != 2 {
t.Fatal("expected two events on watch")
} }
if string(resp.Events[0].Kv.Value) != "3" { if string(resp.Events[0].Kv.Value) != "3" {
t.Fatalf("expected value=3, got event %+v", resp.Events[0]) t.Fatalf("expected value=3, got event %+v", resp.Events[0])
} }
if string(resp.Events[1].Kv.Value) != "4" {
t.Fatalf("expected value=4, got event %+v", resp.Events[1])
}
case <-time.After(5 * time.Second): case <-time.After(5 * time.Second):
t.Fatal("watch timed out") t.Fatal("watch timed out")
} }