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 2021/01/02 18:29:46 UTC
[dubbo-go] branch develop updated: fix config linter error
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 407d234 fix config linter error
407d234 is described below
commit 407d2348caae7fa42e30eb00ea4b9e8edf380dc9
Author: AlexStocks <al...@foxmail.com>
AuthorDate: Sun Jan 3 02:29:23 2021 +0800
fix config linter error
---
config/base_config_test.go | 4 +---
config/config_loader_test.go | 18 ++++++++++++------
config/registry_config_test.go | 5 ++---
config/service_config_test.go | 3 ++-
config_center/apollo/impl_test.go | 2 +-
config_center/nacos/impl_test.go | 3 ++-
6 files changed, 20 insertions(+), 15 deletions(-)
diff --git a/config/base_config_test.go b/config/base_config_test.go
index 849a9c4..9e5565f 100644
--- a/config/base_config_test.go
+++ b/config/base_config_test.go
@@ -17,7 +17,6 @@
package config
import (
- "fmt"
"reflect"
"testing"
)
@@ -285,8 +284,7 @@ func TestInitializeStruct(t *testing.T) {
tp := reflect.TypeOf(ConsumerConfig{})
v := reflect.New(tp)
initializeStruct(tp, v.Elem())
- fmt.Println(reflect.ValueOf(testConsumerConfig).Elem().Type().String())
- fmt.Println(v.Elem().Type().String())
+ t.Logf("testConsumerConfig type:%s", reflect.ValueOf(testConsumerConfig).Elem().Type().String())
reflect.ValueOf(testConsumerConfig).Elem().Set(v.Elem())
assert.Condition(t, func() (success bool) {
diff --git a/config/config_loader_test.go b/config/config_loader_test.go
index c3c3eb9..ef76bc0 100644
--- a/config/config_loader_test.go
+++ b/config/config_loader_test.go
@@ -143,7 +143,8 @@ func TestLoadWithSingleReg(t *testing.T) {
conServices = map[string]common.RPCService{}
proServices = map[string]common.RPCService{}
- common.ServiceMap.UnRegister("com.MockService", "mock", common.ServiceKey("com.MockService", "huadong_idc", "1.0.0"))
+ err := common.ServiceMap.UnRegister("com.MockService", "mock", common.ServiceKey("com.MockService", "huadong_idc", "1.0.0"))
+ assert.Nil(t, err)
consumerConfig = nil
providerConfig = nil
}
@@ -182,7 +183,8 @@ func TestWithNoRegLoad(t *testing.T) {
conServices = map[string]common.RPCService{}
proServices = map[string]common.RPCService{}
- common.ServiceMap.UnRegister("com.MockService", "mock", common.ServiceKey("com.MockService", "huadong_idc", "1.0.0"))
+ err := common.ServiceMap.UnRegister("com.MockService", "mock", common.ServiceKey("com.MockService", "huadong_idc", "1.0.0"))
+ assert.Nil(t, err)
consumerConfig = nil
providerConfig = nil
}
@@ -203,10 +205,12 @@ func TestConfigLoaderWithConfigCenter(t *testing.T) {
assert.Equal(t, ProviderConfig{}, GetProviderConfig())
err = ConsumerInit(conPath)
- configCenterRefreshConsumer()
+ assert.NoError(t, err)
+ err = configCenterRefreshConsumer()
assert.NoError(t, err)
err = ProviderInit(proPath)
- configCenterRefreshProvider()
+ assert.NoError(t, err)
+ err = configCenterRefreshProvider()
assert.NoError(t, err)
assert.NotNil(t, consumerConfig)
@@ -256,13 +260,15 @@ func TestConfigLoaderWithConfigCenterSingleRegistry(t *testing.T) {
assert.Equal(t, ProviderConfig{}, GetProviderConfig())
err = ConsumerInit(conPath)
+ assert.NoError(t, err)
checkApplicationName(consumerConfig.ApplicationConfig)
- configCenterRefreshConsumer()
+ err = configCenterRefreshConsumer()
checkRegistries(consumerConfig.Registries, consumerConfig.Registry)
assert.NoError(t, err)
err = ProviderInit(proPath)
+ assert.NoError(t, err)
checkApplicationName(providerConfig.ApplicationConfig)
- configCenterRefreshProvider()
+ err = configCenterRefreshProvider()
checkRegistries(providerConfig.Registries, providerConfig.Registry)
assert.NoError(t, err)
diff --git a/config/registry_config_test.go b/config/registry_config_test.go
index 6e5dedc..8bd2de1 100644
--- a/config/registry_config_test.go
+++ b/config/registry_config_test.go
@@ -17,7 +17,6 @@
package config
import (
- "fmt"
"testing"
)
@@ -43,7 +42,7 @@ func TestLoadRegistries(t *testing.T) {
},
}
urls := loadRegistries(target, regs, common.CONSUMER)
- fmt.Println(urls[0])
+ t.Logf("loadRegistries() = urls:%v", urls)
assert.Equal(t, "127.0.0.2:2181,128.0.0.1:2181", urls[0].Location)
}
@@ -61,6 +60,6 @@ func TestLoadRegistries1(t *testing.T) {
},
}
urls := loadRegistries(target, regs, common.CONSUMER)
- fmt.Println(urls[0])
+ t.Logf("loadRegistries() = urls:%v", urls)
assert.Equal(t, "127.0.0.2:2181", urls[0].Location)
}
diff --git a/config/service_config_test.go b/config/service_config_test.go
index 61c8864..aea0bde 100644
--- a/config/service_config_test.go
+++ b/config/service_config_test.go
@@ -176,7 +176,8 @@ func TestExport(t *testing.T) {
service := providerConfig.Services[i]
service.Implement(&MockService{})
service.Protocols = providerConfig.Protocols
- service.Export()
+ err := service.Export()
+ assert.Nil(t, err)
}
providerConfig = nil
}
diff --git a/config_center/apollo/impl_test.go b/config_center/apollo/impl_test.go
index 4044570..38ef008 100644
--- a/config_center/apollo/impl_test.go
+++ b/config_center/apollo/impl_test.go
@@ -227,7 +227,7 @@ func TestListener(t *testing.T) {
apollo.listeners.Range(func(_, value interface{}) bool {
apolloListener := value.(*apolloListener)
for e := range apolloListener.listeners {
- fmt.Println(e)
+ t.Logf("listener:%v", e)
listenerCount++
}
return true
diff --git a/config_center/nacos/impl_test.go b/config_center/nacos/impl_test.go
index 710fef0..89917d1 100644
--- a/config_center/nacos/impl_test.go
+++ b/config_center/nacos/impl_test.go
@@ -102,7 +102,8 @@ func TestNacosDynamicConfiguration_GetConfigKeysByGroup(t *testing.T) {
}
`
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Write([]byte(data))
+ _, err := w.Write([]byte(data))
+ assert.Nil(t, err)
}))
nacosURL := strings.ReplaceAll(ts.URL, "http", "registry")