zishuo/rpcx
1
0
Fork 0
mirror of https://github.com/smallnest/rpcx.git synced 2025-10-27 18:10:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

change NewXXXDiscovery to return an error instead of panic

Browse Source
This commit is contained in:
chaoyuepan
2020-12-29 17:41:25 +08:00
parent 2b4fc5951d
commit f426b53fa0
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
client/xclient_test.go
View File

@@ -32,7 +32,11 @@ func TestXClient_Thrift(t *testing.T) {
BackupLatency: 10 * time.Millisecond, BackupLatency: 10 * time.Millisecond,
} }
d := NewPeer2PeerDiscovery("tcp@"+addr, "desc=a test service") d, err := NewPeer2PeerDiscovery("tcp@"+addr, "desc=a test service")
if err != nil {
t.Fatalf("failed to NewPeer2PeerDiscovery: %v", err)
}
xclient := NewXClient("Arith", Failtry, RandomSelect, d, opt) xclient := NewXClient("Arith", Failtry, RandomSelect, d, opt)
defer xclient.Close() defer xclient.Close()
@@ -43,7 +47,7 @@ func TestXClient_Thrift(t *testing.T) {
reply := testutils.ThriftReply{} reply := testutils.ThriftReply{}
err := xclient.Call(context.Background(), "ThriftMul", &args, &reply) err = xclient.Call(context.Background(), "ThriftMul", &args, &reply)
if err != nil { if err != nil {
t.Fatalf("failed to call: %v", err) t.Fatalf("failed to call: %v", err)
} }
@@ -63,7 +67,11 @@ func TestXClient_IT(t *testing.T) {
addr := s.Address().String() addr := s.Address().String()
d := NewPeer2PeerDiscovery("tcp@"+addr, "desc=a test service") d, err := NewPeer2PeerDiscovery("tcp@"+addr, "desc=a test service")
if err != nil {
t.Fatalf("failed to NewPeer2PeerDiscovery: %v", err)
}
xclient := NewXClient("Arith", Failtry, RandomSelect, d, DefaultOption) xclient := NewXClient("Arith", Failtry, RandomSelect, d, DefaultOption)
defer xclient.Close() defer xclient.Close()

6
server/plugin_test.go
View File

@@ -49,7 +49,11 @@ func TestPluginHeartbeat(t *testing.T) {
opts.IdleTimeout = time.Duration(5) * time.Second opts.IdleTimeout = time.Duration(5) * time.Second
opts.ConnectTimeout = time.Duration(5) * time.Second opts.ConnectTimeout = time.Duration(5) * time.Second
// PeerDiscovery // PeerDiscovery
d := client.NewPeer2PeerDiscovery("tcp@127.0.0.1:9001", "") d, err := client.NewPeer2PeerDiscovery("tcp@127.0.0.1:9001", "")
if err != nil {
t.Fatalf("failed to NewPeer2PeerDiscovery: %v", err)
}
c := client.NewXClient("Arith", client.Failtry, client.RoundRobin, d, opts) c := client.NewXClient("Arith", client.Failtry, client.RoundRobin, d, opts)
i := 0 i := 0
for { for {