Quellcode durchsuchen

Fix lint issues

tags/v2.0.0-rc1
9seconds vor 5 Jahren
Ursprung
Commit
0395ce8d1a

+ 4
- 4
mtglib/network/circuit_breaker.go Datei anzeigen

@@ -66,7 +66,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context,
66 66
 	if err == nil {
67 67
 		c.switchState(circuitBreakerStateClosed)
68 68
 
69
-		return conn, err
69
+		return conn, err // nolint: wrapcheck
70 70
 	}
71 71
 
72 72
 	c.failuresCount++
@@ -75,7 +75,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context,
75 75
 		c.switchState(circuitBreakerStateOpened)
76 76
 	}
77 77
 
78
-	return conn, err
78
+	return conn, err // nolint: wrapcheck
79 79
 }
80 80
 
81 81
 func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context, network, address string) (net.Conn, error) {
@@ -99,7 +99,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context, network, addres
99 99
 	}
100 100
 
101 101
 	if c.state != circuitBreakerStateHalfOpened {
102
-		return conn, err
102
+		return conn, err // nolint: wrapcheck
103 103
 	}
104 104
 
105 105
 	if err == nil {
@@ -108,7 +108,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context, network, addres
108 108
 		c.switchState(circuitBreakerStateOpened)
109 109
 	}
110 110
 
111
-	return conn, err
111
+	return conn, err // nolint: wrapcheck
112 112
 }
113 113
 
114 114
 func (c *circuitBreakerDialer) switchState(state uint32) {

+ 5
- 4
mtglib/network/circuit_breaker_internal_test.go Datei anzeigen

@@ -110,10 +110,10 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() {
110 110
 		Port: 80,
111 111
 	})
112 112
 
113
-	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1")
114
-	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1")
115
-	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1")
116
-	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1")
113
+	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
114
+	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
115
+	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
116
+	suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck
117 117
 
118 118
 	time.Sleep(500 * time.Millisecond)
119 119
 
@@ -135,5 +135,6 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() {
135 135
 }
136 136
 
137 137
 func TestCircuitBreaker(t *testing.T) {
138
+	t.Parallel()
138 139
 	suite.Run(t, &CircuitBreakerTestSuite{})
139 140
 }

+ 5
- 1
mtglib/network/default_test.go Datei anzeigen

@@ -68,12 +68,16 @@ func (suite *DefaultDialerTestSuite) TestConnectOk() {
68 68
 func (suite *DefaultDialerTestSuite) TestHTTPRequest() {
69 69
 	httpClient := suite.MakeHTTPClient(suite.d)
70 70
 
71
-	resp, err := httpClient.Get(suite.MakeURL("/get"))
71
+	resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
72
+	if err == nil {
73
+		defer resp.Body.Close()
74
+	}
72 75
 
73 76
 	suite.NoError(err)
74 77
 	suite.Equal(http.StatusOK, resp.StatusCode)
75 78
 }
76 79
 
77 80
 func TestDefaultDialer(t *testing.T) {
81
+	t.Parallel()
78 82
 	suite.Run(t, &DefaultDialerTestSuite{})
79 83
 }

+ 1
- 42
mtglib/network/init_test.go Datei anzeigen

@@ -7,7 +7,6 @@ import (
7 7
 	"net/http/httptest"
8 8
 	"net/url"
9 9
 	"strings"
10
-	"time"
11 10
 
12 11
 	"github.com/9seconds/mtg/v2/mtglib/network"
13 12
 	socks5 "github.com/armon/go-socks5"
@@ -15,46 +14,6 @@ import (
15 14
 	"github.com/stretchr/testify/mock"
16 15
 )
17 16
 
18
-type ConnMock struct {
19
-	mock.Mock
20
-}
21
-
22
-func (c *ConnMock) Read(b []byte) (int, error) {
23
-	args := c.Called(b)
24
-
25
-	return args.Int(0), args.Error(1)
26
-}
27
-
28
-func (c *ConnMock) Write(b []byte) (int, error) {
29
-	args := c.Called(b)
30
-
31
-	return args.Int(0), args.Error(1)
32
-}
33
-
34
-func (c *ConnMock) Close() error {
35
-	return c.Called().Error(0)
36
-}
37
-
38
-func (c *ConnMock) LocalAddr() net.Addr {
39
-	return c.Called().Get(0).(net.Addr)
40
-}
41
-
42
-func (c *ConnMock) RemoteAddr() net.Addr {
43
-	return c.Called().Get(0).(net.Addr)
44
-}
45
-
46
-func (c *ConnMock) SetDeadline(t time.Time) error {
47
-	return c.Called(t).Error(0)
48
-}
49
-
50
-func (c *ConnMock) SetReadDeadline(t time.Time) error {
51
-	return c.Called(t).Error(0)
52
-}
53
-
54
-func (c *ConnMock) SetWriteDeadline(t time.Time) error {
55
-	return c.Called(t).Error(0)
56
-}
57
-
58 17
 type DialerMock struct {
59 18
 	mock.Mock
60 19
 }
@@ -112,7 +71,7 @@ func (suite *Socks5ServerTestSuite) SetupSuite() {
112 71
 		},
113 72
 	})
114 73
 
115
-	go suite.socks5Server.Serve(suite.socks5Listener)
74
+	go suite.socks5Server.Serve(suite.socks5Listener) // nolint: errcheck
116 75
 }
117 76
 
118 77
 func (suite *Socks5ServerTestSuite) TearDownSuite() {

+ 2
- 1
mtglib/network/load_balanced_socks5.go Datei anzeigen

@@ -23,6 +23,7 @@ func (l loadBalancedSocks5Dialer) DialContext(ctx context.Context, network, addr
23 23
 
24 24
 	for i := start; i != start || !moved; i = (i + 1) % length {
25 25
 		moved = true
26
+
26 27
 		if conn, err := l.dialers[i].DialContext(ctx, network, address); err == nil {
27 28
 			return conn, nil
28 29
 		}
@@ -32,7 +33,7 @@ func (l loadBalancedSocks5Dialer) DialContext(ctx context.Context, network, addr
32 33
 }
33 34
 
34 35
 func NewLoadBalancedSocks5Dialer(baseDialer Dialer, proxyURLs []*url.URL) (Dialer, error) {
35
-	var dialers []Dialer
36
+	dialers := make([]Dialer, 0, len(proxyURLs))
36 37
 
37 38
 	for _, u := range proxyURLs {
38 39
 		dialer, err := NewSocks5Dialer(newProxyDialer(baseDialer, u), u)

+ 5
- 1
mtglib/network/load_balanced_socks5_test.go Datei anzeigen

@@ -77,12 +77,16 @@ func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() {
77 77
 }
78 78
 
79 79
 func (suite *LoadBalancedSocks5TestSuite) TestDialOk() {
80
-	resp, err := suite.httpClient.Get(suite.MakeURL("/get"))
80
+	resp, err := suite.httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
81
+	if err == nil {
82
+		defer resp.Body.Close()
83
+	}
81 84
 
82 85
 	suite.NoError(err)
83 86
 	suite.Equal(http.StatusOK, resp.StatusCode)
84 87
 }
85 88
 
86 89
 func TestLoadBalancedSocks5(t *testing.T) {
90
+	t.Parallel()
87 91
 	suite.Run(t, &LoadBalancedSocks5TestSuite{})
88 92
 }

+ 7
- 3
mtglib/network/proxy_dialer_internal_test.go Datei anzeigen

@@ -48,8 +48,9 @@ func (suite *ProxyDialerTestSuite) TestOpenThreshold() {
48 48
 	params := []string{"-30", "aaa", "1.0", "-1.0"}
49 49
 
50 50
 	for _, v := range params {
51
+		param := v
51 52
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
52
-			query.Set("open_threshold", v)
53
+			query.Set("open_threshold", param)
53 54
 
54 55
 			suite.u.RawQuery = query.Encode()
55 56
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
@@ -64,8 +65,9 @@ func (suite *ProxyDialerTestSuite) TestHalfOpenTimeout() {
64 65
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
65 66
 
66 67
 	for _, v := range params {
68
+		param := v
67 69
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
68
-			query.Set("half_open_timeout", v)
70
+			query.Set("half_open_timeout", param)
69 71
 
70 72
 			suite.u.RawQuery = query.Encode()
71 73
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
@@ -80,8 +82,9 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() {
80 82
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
81 83
 
82 84
 	for _, v := range params {
85
+		param := v
83 86
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
84
-			query.Set("reset_failures_timeout", v)
87
+			query.Set("reset_failures_timeout", param)
85 88
 
86 89
 			suite.u.RawQuery = query.Encode()
87 90
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
@@ -92,5 +95,6 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() {
92 95
 }
93 96
 
94 97
 func TestProxyDialer(t *testing.T) {
98
+	t.Parallel()
95 99
 	suite.Run(t, &ProxyDialerTestSuite{})
96 100
 }

+ 9
- 2
mtglib/network/socks5_test.go Datei anzeigen

@@ -33,7 +33,10 @@ func (suite *Socks5TestSuite) TestRequestFailed() {
33 33
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
34 34
 	httpClient := suite.MakeHTTPClient(dialer)
35 35
 
36
-	_, err := httpClient.Get(suite.MakeURL("/get"))
36
+	resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
37
+	if err == nil {
38
+		defer resp.Body.Close()
39
+	}
37 40
 
38 41
 	suite.Error(err)
39 42
 }
@@ -43,12 +46,16 @@ func (suite *Socks5TestSuite) TestRequestOk() {
43 46
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
44 47
 	httpClient := suite.MakeHTTPClient(dialer)
45 48
 
46
-	resp, err := httpClient.Get(suite.MakeURL("/get"))
49
+	resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx
50
+	if err == nil {
51
+		defer resp.Body.Close()
52
+	}
47 53
 
48 54
 	suite.NoError(err)
49 55
 	suite.Equal(http.StatusOK, resp.StatusCode)
50 56
 }
51 57
 
52 58
 func TestSocks5TestSuite(t *testing.T) {
59
+	t.Parallel()
53 60
 	suite.Run(t, &Socks5TestSuite{})
54 61
 }

Laden…
Abbrechen
Speichern