mirror of
https://github.com/ScuroNeko/mtg.git
synced 2026-09-01 16:01:55 +03:00
Minor formatting issues
This commit is contained in:
@@ -125,7 +125,6 @@ func (c *circuitBreakerDialer) switchState(state uint32) {
|
||||
}
|
||||
|
||||
c.failuresCount = 0
|
||||
|
||||
atomic.StoreUint32(&c.halfOpenAttempts, 0)
|
||||
atomic.StoreUint32(&c.state, state)
|
||||
}
|
||||
@@ -158,7 +157,6 @@ func (c *circuitBreakerDialer) tryHalfOpen() {
|
||||
|
||||
func (c *circuitBreakerDialer) stopTimer(timerRef **time.Timer) {
|
||||
timer := *timerRef
|
||||
|
||||
if timer == nil {
|
||||
return
|
||||
}
|
||||
|
||||
@@ -51,7 +51,6 @@ func (suite *CircuitBreakerTestSuite) TestMultipleRunsOk() {
|
||||
Return(suite.connMock, nil)
|
||||
|
||||
wg := &sync.WaitGroup{}
|
||||
|
||||
wg.Add(5)
|
||||
|
||||
go func() {
|
||||
@@ -126,7 +125,6 @@ func (suite *CircuitBreakerTestSuite) TestHalfOpen() {
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
|
||||
conn, err := suite.d.DialContext(suite.ctx, "tcp", "127.0.0.2")
|
||||
|
||||
suite.NoError(err)
|
||||
suite.Equal("10.0.0.10:80", conn.RemoteAddr().String())
|
||||
|
||||
|
||||
@@ -20,7 +20,6 @@ func (suite *DefaultDialerTestSuite) SetupSuite() {
|
||||
suite.HTTPServerTestSuite.SetupSuite()
|
||||
|
||||
d, err := network.NewDefaultDialer(0, 0)
|
||||
|
||||
suite.NoError(err)
|
||||
|
||||
suite.d = d
|
||||
@@ -28,13 +27,11 @@ func (suite *DefaultDialerTestSuite) SetupSuite() {
|
||||
|
||||
func (suite *DefaultDialerTestSuite) TestNegativeTimeout() {
|
||||
_, err := network.NewDefaultDialer(-1, 0)
|
||||
|
||||
suite.Error(err)
|
||||
}
|
||||
|
||||
func (suite *DefaultDialerTestSuite) TestNegativeBufferSize() {
|
||||
_, err := network.NewDefaultDialer(0, -1)
|
||||
|
||||
suite.Error(err)
|
||||
}
|
||||
|
||||
@@ -42,7 +39,6 @@ func (suite *DefaultDialerTestSuite) TestUnsupportedProtocol() {
|
||||
_, err := suite.d.DialContext(context.Background(),
|
||||
"udp",
|
||||
suite.HTTPServerAddress())
|
||||
|
||||
suite.Error(err)
|
||||
}
|
||||
|
||||
@@ -50,7 +46,6 @@ func (suite *DefaultDialerTestSuite) TestCannotDial() {
|
||||
_, err := suite.d.DialContext(context.Background(),
|
||||
"tcp",
|
||||
suite.HTTPServerAddress()+suite.HTTPServerAddress())
|
||||
|
||||
suite.Error(err)
|
||||
}
|
||||
|
||||
@@ -58,7 +53,6 @@ func (suite *DefaultDialerTestSuite) TestConnectOk() {
|
||||
conn, err := suite.d.DialContext(context.Background(),
|
||||
"tcp",
|
||||
suite.HTTPServerAddress())
|
||||
|
||||
suite.NoError(err)
|
||||
suite.NotNil(conn)
|
||||
|
||||
|
||||
@@ -28,12 +28,10 @@ func (suite *LoadBalancedSocks5TestSuite) SetupSuite() {
|
||||
|
||||
func (suite *LoadBalancedSocks5TestSuite) SetupTest() {
|
||||
baseDialer, _ := network.NewDefaultDialer(0, 0)
|
||||
|
||||
lbDialer, err := network.NewLoadBalancedSocks5Dialer(baseDialer, []*url.URL{
|
||||
suite.MakeSocks5URL("user", "password"),
|
||||
suite.MakeSocks5URL("user2", "password"),
|
||||
})
|
||||
|
||||
suite.NoError(err)
|
||||
|
||||
suite.httpClient = suite.MakeHTTPClient(lbDialer)
|
||||
@@ -48,13 +46,11 @@ func (suite *LoadBalancedSocks5TestSuite) TestIncorrectURL() {
|
||||
_, err := network.NewLoadBalancedSocks5Dialer(&DialerMock{}, []*url.URL{
|
||||
{Scheme: "http"},
|
||||
})
|
||||
|
||||
suite.Error(err)
|
||||
}
|
||||
|
||||
func (suite *LoadBalancedSocks5TestSuite) TestCannotDial() {
|
||||
baseDialer := &DialerMock{}
|
||||
|
||||
baseDialer.On("DialContext", mock.Anything, "tcp", "127.0.0.1:1080").
|
||||
Times(network.ProxyDialerOpenThreshold).
|
||||
Return(&net.TCPConn{}, io.EOF)
|
||||
|
||||
@@ -49,7 +49,6 @@ func (n *network) DialContext(ctx context.Context, protocol, address string) (ne
|
||||
}
|
||||
|
||||
var conn net.Conn
|
||||
|
||||
for _, v := range ips {
|
||||
conn, err = n.dialer.DialContext(ctx, protocol, net.JoinHostPort(v, port))
|
||||
|
||||
|
||||
@@ -22,7 +22,6 @@ func (suite *ProxyDialerTestSuite) SetupSuite() {
|
||||
|
||||
func (suite *ProxyDialerTestSuite) TestSetupDefaults() {
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
|
||||
suite.EqualValues(ProxyDialerOpenThreshold, d.openThreshold)
|
||||
suite.EqualValues(ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
|
||||
suite.EqualValues(ProxyDialerResetFailuresTimeout, d.resetFailuresTimeout)
|
||||
@@ -30,14 +29,12 @@ func (suite *ProxyDialerTestSuite) TestSetupDefaults() {
|
||||
|
||||
func (suite *ProxyDialerTestSuite) TestSetupValuesAllOk() {
|
||||
query := url.Values{}
|
||||
|
||||
query.Set("open_threshold", "30")
|
||||
query.Set("reset_failures_timeout", "1s")
|
||||
query.Set("half_open_timeout", "2s")
|
||||
|
||||
suite.u.RawQuery = query.Encode()
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
suite.EqualValues(30, d.openThreshold)
|
||||
suite.EqualValues(2*time.Second, d.halfOpenTimeout)
|
||||
suite.EqualValues(time.Second, d.resetFailuresTimeout)
|
||||
@@ -51,10 +48,9 @@ func (suite *ProxyDialerTestSuite) TestOpenThreshold() {
|
||||
param := v
|
||||
suite.T().Run(v, func(t *testing.T) {
|
||||
query.Set("open_threshold", param)
|
||||
|
||||
suite.u.RawQuery = query.Encode()
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
assert.EqualValues(t, ProxyDialerOpenThreshold, d.openThreshold)
|
||||
})
|
||||
}
|
||||
@@ -68,10 +64,9 @@ func (suite *ProxyDialerTestSuite) TestHalfOpenTimeout() {
|
||||
param := v
|
||||
suite.T().Run(v, func(t *testing.T) {
|
||||
query.Set("half_open_timeout", param)
|
||||
|
||||
suite.u.RawQuery = query.Encode()
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
|
||||
})
|
||||
}
|
||||
@@ -85,10 +80,9 @@ func (suite *ProxyDialerTestSuite) TestResetFailuresTimeout() {
|
||||
param := v
|
||||
suite.T().Run(v, func(t *testing.T) {
|
||||
query.Set("reset_failures_timeout", param)
|
||||
|
||||
suite.u.RawQuery = query.Encode()
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
|
||||
d := newProxyDialer(&DialerMock{}, suite.u).(*circuitBreakerDialer)
|
||||
assert.EqualValues(t, ProxyDialerHalfOpenTimeout, d.halfOpenTimeout)
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user