You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2020/02/29 05:04:27 UTC
[dubbo-go] branch develop updated: Fix remoting/etcdv3/client test
cases
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-go.git
The following commit(s) were added to refs/heads/develop by this push:
new 6e92af9 Fix remoting/etcdv3/client test cases
new 44edf4f Merge pull request #375 from zjhmale/improve/remoting-etcdv3-specs
6e92af9 is described below
commit 6e92af96ba04f4528b88a43d2cb3eacb293e81fb
Author: zjhsdtc <zj...@gmail.com>
AuthorDate: Wed Feb 26 10:13:58 2020 +0800
Fix remoting/etcdv3/client test cases
---
remoting/etcdv3/client_test.go | 34 +++++++++++++++++++++++++++++++---
1 file changed, 31 insertions(+), 3 deletions(-)
diff --git a/remoting/etcdv3/client_test.go b/remoting/etcdv3/client_test.go
index 8f9b80c..d9166fc 100644
--- a/remoting/etcdv3/client_test.go
+++ b/remoting/etcdv3/client_test.go
@@ -31,6 +31,7 @@ import (
import (
"github.com/coreos/etcd/mvcc/mvccpb"
perrors "github.com/pkg/errors"
+ "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/suite"
"go.etcd.io/etcd/embed"
"google.golang.org/grpc/connectivity"
@@ -171,6 +172,10 @@ func (suite *ClientTestSuite) TestClientDone() {
}()
c.Wait.Wait()
+
+ if c.Valid() == true {
+ suite.T().Fatal("client should be invalid then")
+ }
}
func (suite *ClientTestSuite) TestClientCreateKV() {
@@ -295,13 +300,26 @@ func (suite *ClientTestSuite) TestClientWatch() {
t.Fatal(err)
}
+ events := make([]mvccpb.Event, 0)
+ var eCreate, eDelete mvccpb.Event
+
for e := range wc {
for _, event := range e.Events {
+ events = append(events, (mvccpb.Event)(*event))
+ if event.Type == mvccpb.PUT {
+ eCreate = (mvccpb.Event)(*event)
+ }
+ if event.Type == mvccpb.DELETE {
+ eDelete = (mvccpb.Event)(*event)
+ }
t.Logf("type IsCreate %v k %s v %s", event.IsCreate(), event.Kv.Key, event.Kv.Value)
}
}
+ assert.Equal(t, 2, len(events))
+ assert.Contains(t, events, eCreate)
+ assert.Contains(t, events, eDelete)
}()
for _, tc := range tests {
@@ -334,25 +352,35 @@ func (suite *ClientTestSuite) TestClientRegisterTemp() {
wg.Add(1)
go func() {
+ defer wg.Done()
+
completePath := path.Join("scott", "wang")
wc, err := observeC.watch(completePath)
if err != nil {
t.Fatal(err)
}
+ events := make([]mvccpb.Event, 0)
+ var eCreate, eDelete mvccpb.Event
+
for e := range wc {
for _, event := range e.Events {
-
+ events = append(events, (mvccpb.Event)(*event))
if event.Type == mvccpb.DELETE {
+ eDelete = (mvccpb.Event)(*event)
t.Logf("complete key (%s) is delete", completePath)
- wg.Done()
observeC.Close()
- return
+ break
}
+ eCreate = (mvccpb.Event)(*event)
t.Logf("type IsCreate %v k %s v %s", event.IsCreate(), event.Kv.Key, event.Kv.Value)
}
}
+
+ assert.Equal(t, 2, len(events))
+ assert.Contains(t, events, eCreate)
+ assert.Contains(t, events, eDelete)
}()
_, err := c.RegisterTemp("scott", "wang")