From 0395ce8d1af489da0078a25f155c13ae3d3694f8 Mon Sep 17 00:00:00 2001 From: 9seconds Date: Wed, 10 Mar 2021 10:45:32 +0300 Subject: [PATCH] Fix lint issues --- mtglib/network/circuit_breaker.go | 8 ++-- .../network/circuit_breaker_internal_test.go | 9 ++-- mtglib/network/default_test.go | 6 ++- mtglib/network/init_test.go | 43 +------------------ mtglib/network/load_balanced_socks5.go | 3 +- mtglib/network/load_balanced_socks5_test.go | 6 ++- mtglib/network/proxy_dialer_internal_test.go | 10 +++-- mtglib/network/socks5_test.go | 11 ++++- 8 files changed, 38 insertions(+), 58 deletions(-) diff --git a/mtglib/network/circuit_breaker.go b/mtglib/network/circuit_breaker.go index cd3d3c9..6c08b33 100644 --- a/mtglib/network/circuit_breaker.go +++ b/mtglib/network/circuit_breaker.go @@ -66,7 +66,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context, if err == nil { c.switchState(circuitBreakerStateClosed) - return conn, err + return conn, err // nolint: wrapcheck } c.failuresCount++ @@ -75,7 +75,7 @@ func (c *circuitBreakerDialer) doClosed(ctx context.Context, c.switchState(circuitBreakerStateOpened) } - return conn, err + return conn, err // nolint: wrapcheck } 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 } if c.state != circuitBreakerStateHalfOpened { - return conn, err + return conn, err // nolint: wrapcheck } if err == nil { @@ -108,7 +108,7 @@ func (c *circuitBreakerDialer) doHalfOpened(ctx context.Context, network, addres c.switchState(circuitBreakerStateOpened) } - return conn, err + return conn, err // nolint: wrapcheck } func (c *circuitBreakerDialer) switchState(state uint32) { diff --git a/mtglib/network/circuit_breaker_internal_test.go b/mtglib/network/circuit_breaker_internal_test.go index abb33df..849addd 100644 --- a/mtglib/network/circuit_breaker_internal_test.go +++ b/mtglib/network/circuit_breaker_internal_test.go @@ -110,10 +110,10 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() { Port: 80, }) - suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") - suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") - suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") - suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") + suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck + suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck + suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck + suite.d.DialContext(suite.ctx, "tcp", "127.0.0.1") // nolint: errcheck time.Sleep(500 * time.Millisecond) @@ -135,5 +135,6 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() { } func TestCircuitBreaker(t *testing.T) { + t.Parallel() suite.Run(t, &CircuitBreakerTestSuite{}) } diff --git a/mtglib/network/default_test.go b/mtglib/network/default_test.go index 3f1deb9..ba0d779 100644 --- a/mtglib/network/default_test.go +++ b/mtglib/network/default_test.go @@ -68,12 +68,16 @@ func (suite *DefaultDialerTestSuite) TestConnectOk() { func (suite *DefaultDialerTestSuite) TestHTTPRequest() { httpClient := suite.MakeHTTPClient(suite.d) - resp, err := httpClient.Get(suite.MakeURL("/get")) + resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx + if err == nil { + defer resp.Body.Close() + } suite.NoError(err) suite.Equal(http.StatusOK, resp.StatusCode) } func TestDefaultDialer(t *testing.T) { + t.Parallel() suite.Run(t, &DefaultDialerTestSuite{}) } diff --git a/mtglib/network/init_test.go b/mtglib/network/init_test.go index 5ac8cdd..8f648d9 100644 --- a/mtglib/network/init_test.go +++ b/mtglib/network/init_test.go @@ -7,7 +7,6 @@ import ( "net/http/httptest" "net/url" "strings" - "time" "github.com/9seconds/mtg/v2/mtglib/network" socks5 "github.com/armon/go-socks5" @@ -15,46 +14,6 @@ import ( "github.com/stretchr/testify/mock" ) -type ConnMock struct { - mock.Mock -} - -func (c *ConnMock) Read(b []byte) (int, error) { - args := c.Called(b) - - return args.Int(0), args.Error(1) -} - -func (c *ConnMock) Write(b []byte) (int, error) { - args := c.Called(b) - - return args.Int(0), args.Error(1) -} - -func (c *ConnMock) Close() error { - return c.Called().Error(0) -} - -func (c *ConnMock) LocalAddr() net.Addr { - return c.Called().Get(0).(net.Addr) -} - -func (c *ConnMock) RemoteAddr() net.Addr { - return c.Called().Get(0).(net.Addr) -} - -func (c *ConnMock) SetDeadline(t time.Time) error { - return c.Called(t).Error(0) -} - -func (c *ConnMock) SetReadDeadline(t time.Time) error { - return c.Called(t).Error(0) -} - -func (c *ConnMock) SetWriteDeadline(t time.Time) error { - return c.Called(t).Error(0) -} - type DialerMock struct { mock.Mock } @@ -112,7 +71,7 @@ func (suite *Socks5ServerTestSuite) SetupSuite() { }, }) - go suite.socks5Server.Serve(suite.socks5Listener) + go suite.socks5Server.Serve(suite.socks5Listener) // nolint: errcheck } func (suite *Socks5ServerTestSuite) TearDownSuite() { diff --git a/mtglib/network/load_balanced_socks5.go b/mtglib/network/load_balanced_socks5.go index adb7ef5..2a60d69 100644 --- a/mtglib/network/load_balanced_socks5.go +++ b/mtglib/network/load_balanced_socks5.go @@ -23,6 +23,7 @@ func (l loadBalancedSocks5Dialer) DialContext(ctx context.Context, network, addr for i := start; i != start || !moved; i = (i + 1) % length { moved = true + if conn, err := l.dialers[i].DialContext(ctx, network, address); err == nil { return conn, nil } @@ -32,7 +33,7 @@ func (l loadBalancedSocks5Dialer) DialContext(ctx context.Context, network, addr } func NewLoadBalancedSocks5Dialer(baseDialer Dialer, proxyURLs []*url.URL) (Dialer, error) { - var dialers []Dialer + dialers := make([]Dialer, 0, len(proxyURLs)) for _, u := range proxyURLs { dialer, err := NewSocks5Dialer(newProxyDialer(baseDialer, u), u) diff --git a/mtglib/network/load_balanced_socks5_test.go b/mtglib/network/load_balanced_socks5_test.go index 129597b..f86e3f1 100644 --- a/mtglib/network/load_balanced_socks5_test.go +++ b/mtglib/network/load_balanced_socks5_test.go @@ -77,12 +77,16 @@ func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() { } func (suite *LoadBalancedSocks5TestSuite) TestDialOk() { - resp, err := suite.httpClient.Get(suite.MakeURL("/get")) + resp, err := suite.httpClient.Get(suite.MakeURL("/get")) // nolint: noctx + if err == nil { + defer resp.Body.Close() + } suite.NoError(err) suite.Equal(http.StatusOK, resp.StatusCode) } func TestLoadBalancedSocks5(t *testing.T) { + t.Parallel() suite.Run(t, &LoadBalancedSocks5TestSuite{}) } diff --git a/mtglib/network/proxy_dialer_internal_test.go b/mtglib/network/proxy_dialer_internal_test.go index 42c18fb..1183908 100644 --- a/mtglib/network/proxy_dialer_internal_test.go +++ b/mtglib/network/proxy_dialer_internal_test.go @@ -48,8 +48,9 @@ func (suite *ProxyDialerTestSuite) TestOpenThreshold() { params := []string{"-30", "aaa", "1.0", "-1.0"} for _, v := range params { + param := v suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) { - query.Set("open_threshold", v) + query.Set("open_threshold", param) suite.u.RawQuery = query.Encode() d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) @@ -64,8 +65,9 @@ func (suite *ProxyDialerTestSuite) TestHalfOpenTimeout() { params := []string{"-30", "30", "aaa", "-3.0", "3.0"} for _, v := range params { + param := v suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) { - query.Set("half_open_timeout", v) + query.Set("half_open_timeout", param) suite.u.RawQuery = query.Encode() d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) @@ -80,8 +82,9 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() { params := []string{"-30", "30", "aaa", "-3.0", "3.0"} for _, v := range params { + param := v suite.T().Run(fmt.Sprintf("param=%s", v), func(t *testing.T) { - query.Set("reset_failures_timeout", v) + query.Set("reset_failures_timeout", param) suite.u.RawQuery = query.Encode() d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer) @@ -92,5 +95,6 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() { } func TestProxyDialer(t *testing.T) { + t.Parallel() suite.Run(t, &ProxyDialerTestSuite{}) } diff --git a/mtglib/network/socks5_test.go b/mtglib/network/socks5_test.go index 5499af4..82b471f 100644 --- a/mtglib/network/socks5_test.go +++ b/mtglib/network/socks5_test.go @@ -33,7 +33,10 @@ func (suite *Socks5TestSuite) TestRequestFailed() { dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL) httpClient := suite.MakeHTTPClient(dialer) - _, err := httpClient.Get(suite.MakeURL("/get")) + resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx + if err == nil { + defer resp.Body.Close() + } suite.Error(err) } @@ -43,12 +46,16 @@ func (suite *Socks5TestSuite) TestRequestOk() { dialer, _ := network.NewSocks5Dialer(suite.d, proxyURL) httpClient := suite.MakeHTTPClient(dialer) - resp, err := httpClient.Get(suite.MakeURL("/get")) + resp, err := httpClient.Get(suite.MakeURL("/get")) // nolint: noctx + if err == nil { + defer resp.Body.Close() + } suite.NoError(err) suite.Equal(http.StatusOK, resp.StatusCode) } func TestSocks5TestSuite(t *testing.T) { + t.Parallel() suite.Run(t, &Socks5TestSuite{}) }