Develop (#239)

* resolve test cases Co-authored-by: fuzengyao <[email protected]> Co-authored-by: [email protected] <[email protected]> Co-authored-by: denghuaguang <[email protected]> Co-authored-by: myxy99 <[email protected]>
douyu · Aug 6, 2021 · 5913c10 · 5913c10
1 parent 7214e4f
commit 5913c10
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 92 deletions.
diff --git a/pkg/application/application_test.go b/pkg/application/application_test.go
@@ -54,6 +54,9 @@ func (s *testServer) GracefulStop(ctx context.Context) error {
 func (s *testServer) Info() *server.ServiceInfo {
 	return &server.ServiceInfo{}
 }
+func (s *testServer) Healthz() bool {
+	return true
+}
 
 var errTest = fmt.Errorf("test error")
 
@@ -222,7 +225,7 @@ func TestApplication_Serve(t *testing.T) {
 		grpcConfig := xgrpc.DefaultConfig()
 		grpcConfig.Port = 0
 		app.initialize()
-		err := app.Serve(grpcConfig.Build())
+		err := app.Serve(grpcConfig.MustBuild())
 		So(err, ShouldBeNil)
 		go func() {
 			// make sure Serve() is called

diff --git a/pkg/client/etcdv3/client_test.go b/pkg/client/etcdv3/client_test.go
@@ -2,18 +2,20 @@ package etcdv3
 
 import (
 	"context"
+	"testing"
+	"time"
+
 	"github.com/coreos/etcd/clientv3"
 	"github.com/coreos/etcd/clientv3/concurrency"
 	"github.com/stretchr/testify/assert"
-	"testing"
-	"time"
 )
 
 func Test_GetKeyValue(t *testing.T) {
 	config := DefaultConfig()
 	config.Endpoints = []string{"127.0.0.1:2379"}
 	config.TTL = 5
-	etcdCli := newClient(config)
+	etcdCli, err := newClient(config)
+	assert.Nil(t, err)
 
 	ctx := context.TODO()
 
@@ -34,7 +36,8 @@ func Test_MutexLock(t *testing.T) {
 	config := DefaultConfig()
 	config.Endpoints = []string{"127.0.0.1:2379"}
 	config.TTL = 10
-	etcdCli := newClient(config)
+	etcdCli, err := newClient(config)
+	assert.Nil(t, err)
 
 	etcdMutex1, err := etcdCli.NewMutex("/test/lock",
 		concurrency.WithTTL(int(config.TTL)))

diff --git a/pkg/client/etcdv3/config.go b/pkg/client/etcdv3/config.go
@@ -96,3 +96,11 @@ func (config *Config) MustBuild() *Client {
 =======
 >>>>>>> master
 }
+
+func (config *Config) MustBuild() *Client {
+	client, err := config.Build()
+	if err != nil {
+		xlog.Panicf("build etcd client failed: %v", err)
+	}
+	return client
+}
diff --git a/pkg/conf/datasource/apollo/.SampleApp_default b/pkg/conf/datasource/apollo/.SampleApp_default
diff --git a/pkg/registry/etcdv3/registry_test.go b/pkg/registry/etcdv3/registry_test.go
@@ -97,13 +97,15 @@ func Test_etcdv3Registry(t *testing.T) {
 func Test_etcdv3registry_UpdateAddressList(t *testing.T) {
 	etcdConfig := etcdv3.DefaultConfig()
 	etcdConfig.Endpoints = []string{"127.0.0.1:2379"}
-	reg := newETCDRegistry(&Config{
+	reg, err := newETCDRegistry(&Config{
 		Config:      etcdConfig,
 		ReadTimeout: time.Second * 10,
 		Prefix:      "jupiter",
 		logger:      xlog.DefaultLogger,
 	})
 
+	assert.Nil(t, err)
+
 	var routeConfig = registry.RouteConfig{
 		ID:         "1",
 		Scheme:     "grpc",
@@ -117,7 +119,7 @@ func Test_etcdv3registry_UpdateAddressList(t *testing.T) {
 			},
 		},
 	}
-	_, err := reg.client.Put(context.Background(), "/jupiter/service_1/configurators/grpc:///routes/1", routeConfig.String())
+	_, err = reg.client.Put(context.Background(), "/jupiter/service_1/configurators/grpc:///routes/1", routeConfig.String())
 	assert.Nil(t, err)
 	ctx, cancel := context.WithCancel(context.Background())
 	go func() {

diff --git a/pkg/sentinel/config.go b/pkg/sentinel/config.go
@@ -29,19 +29,6 @@ import (
 
 const ModuleName = "sentinel"
 
-func Load(name string, opts ...conf.LoadOption) *Config {
-	var options = conf.DefaultLoadOptions(ModuleName)
-	for _, opt := range opts {
-		opt(&options)
-	}
-
-	var config = DefaultConfig()
-	if err := conf.UnmarshalKey(options.KeyPath(name), config); err != nil {
-		xlog.Panic("unmarshal key", xlog.Any("err", err))
-	}
-	return config
-}
-
 // StdConfig ...
 func StdConfig(name string) *Config {
 	return RawConfig("jupiter.sentinel." + name)

diff --git a/pkg/server/xecho/swagger/swagger.go b/pkg/server/xecho/swagger/swagger.go
diff --git a/pkg/server/xecho/swagger/swagger_test.go b/pkg/server/xecho/swagger/swagger_test.go
diff --git a/pkg/server/xgrpc/server_test.go b/pkg/server/xgrpc/server_test.go
@@ -20,10 +20,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/arschles/assert"
 	"github.com/douyu/jupiter/pkg/constant"
 	"github.com/douyu/jupiter/pkg/xlog"
 	"github.com/smartystreets/goconvey/convey"
+	"github.com/stretchr/testify/assert"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/status"
 )
@@ -59,8 +59,9 @@ func TestServer_Closed(t *testing.T) {
 	convey.Convey("test server stop", t, func() {
 		config := DefaultConfig()
 		config.Port = 0
-		ns := newServer(config)
-		err := ns.Stop()
+		ns, err := newServer(config)
+		assert.Nil(t, err)
+		err = ns.Stop()
 		convey.So(err, convey.ShouldBeNil)
 		err = ns.Serve()
 		convey.So(err, convey.ShouldEqual, grpc.ErrServerStopped)

diff --git a/pkg/util/xfile/lock_windows.go b/pkg/util/xfile/lock_windows.go
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 // +build windows
+
 package xfile
 
 import (

diff --git a/pkg/worker/xcron/config.go b/pkg/worker/xcron/config.go
@@ -132,7 +132,7 @@ func newETCDXcron(config *Config) {
 		config.logger = xlog.DefaultLogger
 	}
 	config.logger = config.logger.With(xlog.FieldMod(ecode.ModXcronETCD), xlog.FieldAddrAny(config.Config.Endpoints))
-	config.client = config.Config.Build()
+	config.client = config.Config.MustBuild()
 	if config.TTL == 0 {
 		config.TTL = DefaultTTL
 	}