mirror of
https://github.com/mattermost/mattermost.git
synced 2026-09-24 16:05:00 +08:00
Changed require.Nil to require.NoError when error type is used (#16900)
This commit is contained in:
@@ -105,11 +105,11 @@ func TestHTTPClientWithProxy(t *testing.T) {
|
||||
c.Transport.(*MattermostTransport).Transport.(*http.Transport).Proxy = http.ProxyURL(purl)
|
||||
|
||||
resp, err := c.Get("http://acme.com")
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
defer resp.Body.Close()
|
||||
|
||||
body, err := ioutil.ReadAll(resp.Body)
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, "proxy", string(body))
|
||||
}
|
||||
|
||||
@@ -150,10 +150,10 @@ func TestDialContextFilter(t *testing.T) {
|
||||
_, err := filter(context.Background(), "", tc.Addr)
|
||||
|
||||
if tc.IsValid {
|
||||
require.Nil(t, err)
|
||||
require.NoError(t, err)
|
||||
require.True(t, didDial)
|
||||
} else {
|
||||
require.NotNil(t, err)
|
||||
require.Error(t, err)
|
||||
require.Equal(t, err, AddressForbidden)
|
||||
require.False(t, didDial)
|
||||
}
|
||||
@@ -172,7 +172,7 @@ func TestUserAgentIsSet(t *testing.T) {
|
||||
client := NewHTTPClient(NewTransport(true, nil, nil))
|
||||
req, err := http.NewRequest("GET", ts.URL, nil)
|
||||
|
||||
require.Nil(t, err, "NewRequest failed", err)
|
||||
require.NoError(t, err, "NewRequest failed", err)
|
||||
|
||||
client.Do(req)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user