test: clihttp use https://example.com/ (#153)

* test: clihttp use https://example.com/

* test: add timeout arg for etcd

* feat: add default timeout

Author: GGXXLL

clihttp/client_test.go

@@ -21,20 +21,20 @@ func TestClient_Do(t *testing.T) {
 	}{
 		{
 			"normal",
-			func() *http.Request { r, _ := http.NewRequest("GET", "https://baidu.com", nil); return r }(),
+			func() *http.Request { r, _ := http.NewRequest("GET", "https://example.com/", nil); return r }(),
 			[]Option{},
 		},
 		{
 			"large request",
 			func() *http.Request {
-				r, _ := http.NewRequest("POST", "https://baidu.com", strings.NewReader(strings.Repeat("t", 10)))
+				r, _ := http.NewRequest("POST", "https://example.com/", strings.NewReader(strings.Repeat("t", 10)))
 				return r
 			}(),
 			[]Option{WithRequestLogThreshold(1)},
 		},
 		{
 			"large response",
-			func() *http.Request { r, _ := http.NewRequest("GET", "https://baidu.com", nil); return r }(),
+			func() *http.Request { r, _ := http.NewRequest("GET", "https://example.com/", nil); return r }(),
 			[]Option{WithResponseLogThreshold(1)},
 		},
 	}
@@ -58,7 +58,7 @@ func TestClient_race(t *testing.T) {
 	for i := 0; i < 100; i++ {
 		t.Run("", func(t *testing.T) {
 			t.Parallel()
-			r, _ := http.NewRequest("GET", "https://baidu.com", nil)
+			r, _ := http.NewRequest("GET", "https://example.com/", nil)
 			_, _ = client.Do(r)
 		})
 	}
@@ -70,7 +70,7 @@ func TestClient_context(t *testing.T) {
 	span1, ctx := opentracing.StartSpanFromContextWithTracer(ctx, tracer, "span1")
 	span1.SetBaggageItem("foo", "bar")
 	span1.Finish()
-	req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "https://baidu.com", nil)
+	req, _ := http.NewRequestWithContext(ctx, http.MethodGet, "https://example.com/", nil)
 
 	client := NewClient(tracer)
 	_, _ = client.Do(req)

clihttp/example_test.go

@@ -8,6 +8,6 @@ import (
 
 func Example() {
 	client := NewClient(opentracing.GlobalTracer())
-	req, _ := http.NewRequest("GET", "https://baidu.com", nil)
+	req, _ := http.NewRequest("GET", "https://example.com/", nil)
 	_, _ = client.Do(req)
 }

leader/election_test.go

@@ -30,8 +30,10 @@ func TestElection(t *testing.T) {
 	var dispatcher = &events.SyncDispatcher{}
 	var e1, e2 Election
 
-	client, err := clientv3.New(clientv3.Config{Endpoints: envDefaultEtcdAddrs})
+	client, err := clientv3.New(clientv3.Config{Endpoints: envDefaultEtcdAddrs, DialTimeout: 2 * time.Second})
 	assert.NoError(t, err)
+	defer client.Close()
+
 	e1 = Election{
 		dispatcher: dispatcher,
 		status:     &Status{isLeader: &atomic.Bool{}},

leader/leaderetcd/etcd_test.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"os"
 	"testing"
+	"time"
 
 	"github.com/DoNewsCode/core/internal"
 	"github.com/DoNewsCode/core/key"
@@ -23,7 +24,10 @@ func TestMain(m *testing.M) {
 }
 
 func TestNewEtcdDriver(t *testing.T) {
-	client, _ := clientv3.New(clientv3.Config{Endpoints: envDefaultEtcdAddrs})
+	client, err := clientv3.New(clientv3.Config{Endpoints: envDefaultEtcdAddrs, DialTimeout: 2 * time.Second})
+	assert.NoError(t, err)
+	defer client.Close()
+
 	e1 := NewEtcdDriver(client, key.New("test"))
 	e2 := NewEtcdDriver(client, key.New("test"))
 

otetcd/dependency.go

@@ -92,7 +92,7 @@ func provideFactory(p factoryIn) (FactoryOut, func()) {
 		co := clientv3.Config{
 			Endpoints:            conf.Endpoints,
 			AutoSyncInterval:     duration(conf.AutoSyncInterval),
-			DialTimeout:          duration(conf.DialTimeout),
+			DialTimeout:          duration(conf.dialTimeout()),
 			DialKeepAliveTime:    duration(conf.DialKeepAliveTime),
 			DialKeepAliveTimeout: duration(conf.DialKeepAliveTimeout),
 			MaxCallSendMsgSize:   conf.MaxCallSendMsgSize,

otetcd/option.go

@@ -6,6 +6,7 @@ import (
 	"github.com/DoNewsCode/core/config"
 	"go.uber.org/zap"
 	"google.golang.org/grpc"
+	"time"
 )
 
 // Option is a type that holds all of available etcd configurations.
@@ -70,3 +71,11 @@ type Option struct {
 	// PermitWithoutStream when set will allow client to send keepalive pings to server without any active streams(RPCs).
 	PermitWithoutStream bool `json:"permitWithoutStream" yaml:"permitWithoutStream"`
 }
+
+// GetDialTimeout provide default timeout duration, avoid program blocking.
+func (o *Option) dialTimeout() config.Duration {
+	if o.DialTimeout.IsZero() {
+		return config.Duration{Duration: 10 * time.Second}
+	}
+	return o.DialTimeout
+}