Преглед изворни кода

Fix lint issues

tags/v2.0.0-rc1
9seconds пре 5 година
родитељ
комит
0395ce8d1a

+ 4
- 4
mtglib/network/circuit_breaker.go Прегледај датотеку

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

+ 5
- 4
mtglib/network/circuit_breaker_internal_test.go Прегледај датотеку

110
 		Port: 80,
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
 	time.Sleep(500 * time.Millisecond)
118
 	time.Sleep(500 * time.Millisecond)
119
 
119
 
135
 }
135
 }
136
 
136
 
137
 func TestCircuitBreaker(t *testing.T) {
137
 func TestCircuitBreaker(t *testing.T) {
138
+	t.Parallel()
138
 	suite.Run(t, &CircuitBreakerTestSuite{})
139
 	suite.Run(t, &CircuitBreakerTestSuite{})
139
 }
140
 }

+ 5
- 1
mtglib/network/default_test.go Прегледај датотеку

68
 func (suite *DefaultDialerTestSuite) TestHTTPRequest() {
68
 func (suite *DefaultDialerTestSuite) TestHTTPRequest() {
69
 	httpClient := suite.MakeHTTPClient(suite.d)
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
 	suite.NoError(err)
76
 	suite.NoError(err)
74
 	suite.Equal(http.StatusOK, resp.StatusCode)
77
 	suite.Equal(http.StatusOK, resp.StatusCode)
75
 }
78
 }
76
 
79
 
77
 func TestDefaultDialer(t *testing.T) {
80
 func TestDefaultDialer(t *testing.T) {
81
+	t.Parallel()
78
 	suite.Run(t, &DefaultDialerTestSuite{})
82
 	suite.Run(t, &DefaultDialerTestSuite{})
79
 }
83
 }

+ 1
- 42
mtglib/network/init_test.go Прегледај датотеку

7
 	"net/http/httptest"
7
 	"net/http/httptest"
8
 	"net/url"
8
 	"net/url"
9
 	"strings"
9
 	"strings"
10
-	"time"
11
 
10
 
12
 	"github.com/9seconds/mtg/v2/mtglib/network"
11
 	"github.com/9seconds/mtg/v2/mtglib/network"
13
 	socks5 "github.com/armon/go-socks5"
12
 	socks5 "github.com/armon/go-socks5"
15
 	"github.com/stretchr/testify/mock"
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
 type DialerMock struct {
17
 type DialerMock struct {
59
 	mock.Mock
18
 	mock.Mock
60
 }
19
 }
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
 func (suite *Socks5ServerTestSuite) TearDownSuite() {
77
 func (suite *Socks5ServerTestSuite) TearDownSuite() {

+ 2
- 1
mtglib/network/load_balanced_socks5.go Прегледај датотеку

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

+ 5
- 1
mtglib/network/load_balanced_socks5_test.go Прегледај датотеку

77
 }
77
 }
78
 
78
 
79
 func (suite *LoadBalancedSocks5TestSuite) TestDialOk() {
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
 	suite.NoError(err)
85
 	suite.NoError(err)
83
 	suite.Equal(http.StatusOK, resp.StatusCode)
86
 	suite.Equal(http.StatusOK, resp.StatusCode)
84
 }
87
 }
85
 
88
 
86
 func TestLoadBalancedSocks5(t *testing.T) {
89
 func TestLoadBalancedSocks5(t *testing.T) {
90
+	t.Parallel()
87
 	suite.Run(t, &LoadBalancedSocks5TestSuite{})
91
 	suite.Run(t, &LoadBalancedSocks5TestSuite{})
88
 }
92
 }

+ 7
- 3
mtglib/network/proxy_dialer_internal_test.go Прегледај датотеку

48
 	params := []string{"-30", "aaa", "1.0", "-1.0"}
48
 	params := []string{"-30", "aaa", "1.0", "-1.0"}
49
 
49
 
50
 	for _, v := range params {
50
 	for _, v := range params {
51
+		param := v
51
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
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
 			suite.u.RawQuery = query.Encode()
55
 			suite.u.RawQuery = query.Encode()
55
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
56
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
64
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
65
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
65
 
66
 
66
 	for _, v := range params {
67
 	for _, v := range params {
68
+		param := v
67
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
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
 			suite.u.RawQuery = query.Encode()
72
 			suite.u.RawQuery = query.Encode()
71
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
73
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
80
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
82
 	params := []string{"-30", "30", "aaa", "-3.0", "3.0"}
81
 
83
 
82
 	for _, v := range params {
84
 	for _, v := range params {
85
+		param := v
83
 		suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) {
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
 			suite.u.RawQuery = query.Encode()
89
 			suite.u.RawQuery = query.Encode()
87
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
90
 			d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
92
 }
95
 }
93
 
96
 
94
 func TestProxyDialer(t *testing.T) {
97
 func TestProxyDialer(t *testing.T) {
98
+	t.Parallel()
95
 	suite.Run(t, &ProxyDialerTestSuite{})
99
 	suite.Run(t, &ProxyDialerTestSuite{})
96
 }
100
 }

+ 9
- 2
mtglib/network/socks5_test.go Прегледај датотеку

33
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
33
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
34
 	httpClient := suite.MakeHTTPClient(dialer)
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
 	suite.Error(err)
41
 	suite.Error(err)
39
 }
42
 }
43
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
46
 	dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL)
44
 	httpClient := suite.MakeHTTPClient(dialer)
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
 	suite.NoError(err)
54
 	suite.NoError(err)
49
 	suite.Equal(http.StatusOK, resp.StatusCode)
55
 	suite.Equal(http.StatusOK, resp.StatusCode)
50
 }
56
 }
51
 
57
 
52
 func TestSocks5TestSuite(t *testing.T) {
58
 func TestSocks5TestSuite(t *testing.T) {
59
+	t.Parallel()
53
 	suite.Run(t, &Socks5TestSuite{})
60
 	suite.Run(t, &Socks5TestSuite{})
54
 }
61
 }

Loading…
Откажи
Сачувај