From 5f043b0a0863a8e726be246abf6da278e876badd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 10 Feb 2021 09:30:36 +0100 Subject: [PATCH] Changed require.Nil to require.NoError when error type is used (#16900) --- services/awsmeter/awsmeter_test.go | 8 +- services/cache/lru_test.go | 74 +++++++++---------- services/cache/provider_test.go | 4 +- services/docextractor/docextractor_test.go | 10 +-- services/filesstore/filesstore_test.go | 8 +- services/filesstore/s3store_test.go | 6 +- services/httpservice/client_test.go | 10 +-- services/imageproxy/atmos_camo_test.go | 2 +- services/imageproxy/local_test.go | 12 +-- services/mailservice/mail_test.go | 60 +++++++-------- .../searchengine/bleveengine/bleve_test.go | 22 +++--- services/upgrader/upgrader_linux_test.go | 16 ++-- 12 files changed, 116 insertions(+), 116 deletions(-) diff --git a/services/awsmeter/awsmeter_test.go b/services/awsmeter/awsmeter_test.go index 21e278285e..6c661dbdec 100644 --- a/services/awsmeter/awsmeter_test.go +++ b/services/awsmeter/awsmeter_test.go @@ -82,7 +82,7 @@ func TestAwsMeterUsage(t *testing.T) { assert.Equal(t, reports[0].Timestamp, resultReports[0].Timestamp) err := awsmeter.ReportUserCategoryUsage(resultReports) - require.Nil(t, err) + require.NoError(t, err) }) t.Run("Error in AWS service call", func(t *testing.T) { @@ -91,7 +91,7 @@ func TestAwsMeterUsage(t *testing.T) { require.NotNil(t, resultReports) assert.Equal(t, 1, len(resultReports)) err := awsmeter.ReportUserCategoryUsage(resultReports) - require.NotNil(t, err) + require.Error(t, err) }) t.Run("Invalid dimension", func(t *testing.T) { @@ -101,7 +101,7 @@ func TestAwsMeterUsage(t *testing.T) { require.NotNil(t, resultReports) assert.Equal(t, 0, len(resultReports)) err := awsmeter.ReportUserCategoryUsage(resultReports) - require.Nil(t, err) + require.NoError(t, err) }) } @@ -144,6 +144,6 @@ func TestAwsMeterUsageWithDBError(t *testing.T) { require.NotNil(t, resultReports) assert.Equal(t, 0, len(resultReports)) err := awsmeter.ReportUserCategoryUsage(resultReports) - require.Nil(t, err) + require.NoError(t, err) }) } diff --git a/services/cache/lru_test.go b/services/cache/lru_test.go index 429846b5e9..99b8126b3c 100644 --- a/services/cache/lru_test.go +++ b/services/cache/lru_test.go @@ -24,18 +24,18 @@ func TestLRU(t *testing.T) { for i := 0; i < 256; i++ { err := l.Set(fmt.Sprintf("%d", i), i) - require.Nil(t, err) + require.NoError(t, err) } size, err := l.Len() - require.Nil(t, err) + require.NoError(t, err) require.Equalf(t, size, 128, "bad len: %v", size) keys, err := l.Keys() - require.Nil(t, err) + require.NoError(t, err) for i, k := range keys { var v int err = l.Get(k, &v) - require.Nil(t, err, "bad key: %v", k) + require.NoError(t, err, "bad key: %v", k) require.Equalf(t, fmt.Sprintf("%d", v), k, "bad key: %v", k) require.Equalf(t, i+128, v, "bad value: %v", k) } @@ -47,7 +47,7 @@ func TestLRU(t *testing.T) { for i := 128; i < 256; i++ { var v int err = l.Get(fmt.Sprintf("%d", i), &v) - require.Nil(t, err, "should not be evicted %v: %v", i, err) + require.NoError(t, err, "should not be evicted %v: %v", i, err) } for i := 128; i < 192; i++ { l.Remove(fmt.Sprintf("%d", i)) @@ -58,11 +58,11 @@ func TestLRU(t *testing.T) { var v int err = l.Get("192", &v) // expect 192 to be last key in l.Keys() - require.Nil(t, err, "should exist") + require.NoError(t, err, "should exist") require.Equalf(t, 192, v, "bad value: %v", v) keys, err = l.Keys() - require.Nil(t, err) + require.NoError(t, err) for i, k := range keys { require.Falsef(t, i < 63 && k != fmt.Sprintf("%d", i+193), "out of order key: %v", k) require.Falsef(t, i == 63 && k != "192", "out of order key: %v", k) @@ -70,15 +70,15 @@ func TestLRU(t *testing.T) { l.Purge() size, err = l.Len() - require.Nil(t, err) + require.NoError(t, err) require.Equalf(t, size, 0, "bad len: %v", size) err = l.Get("200", &v) require.Equal(t, err, ErrKeyNotFound, "should contain nothing") err = l.Set("201", 301) - require.Nil(t, err) + require.NoError(t, err) err = l.Get("201", &v) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, 301, v) } @@ -101,7 +101,7 @@ func TestLRUExpire(t *testing.T) { var r2 int err2 := l.Get("3", &r2) - require.Nil(t, err2, "should exist") + require.NoError(t, err2, "should exist") require.Equal(t, 3, r2) } @@ -118,11 +118,11 @@ func TestLRUMarshalUnMarshal(t *testing.T) { } err := l.Set("test", value1) - require.Nil(t, err) + require.NoError(t, err) var value2 map[string]interface{} err = l.Get("test", &value2) - require.Nil(t, err) + require.NoError(t, err) assert.EqualValues(t, 1, value2["key1"]) v2, ok := value2["key2"].(string) @@ -198,11 +198,11 @@ func TestLRUMarshalUnMarshal(t *testing.T) { }, } err = l.Set("post", post.Clone()) - require.Nil(t, err) + require.NoError(t, err) var p model.Post err = l.Get("post", &p) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, post.Clone(), p.Clone()) session := &model.Session{ @@ -226,11 +226,11 @@ func TestLRUMarshalUnMarshal(t *testing.T) { } err = l.Set("session", session) - require.Nil(t, err) + require.NoError(t, err) var s = &model.Session{} err = l.Get("session", s) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, session, s) user := &model.User{ @@ -269,11 +269,11 @@ func TestLRUMarshalUnMarshal(t *testing.T) { } err = l.Set("user", user) - require.Nil(t, err) + require.NoError(t, err) var u *model.User err = l.Get("user", &u) - require.Nil(t, err) + require.NoError(t, err) // msgp returns an empty map instead of a nil map. // This does not make an actual difference in terms of functionality. u.Timezone = nil @@ -282,11 +282,11 @@ func TestLRUMarshalUnMarshal(t *testing.T) { tt := make(map[string]*model.User) tt["1"] = u err = l.Set("mm", model.UserMap(tt)) - require.Nil(t, err) + require.NoError(t, err) var out map[string]*model.User err = l.Get("mm", &out) - require.Nil(t, err) + require.NoError(t, err) out["1"].Timezone = nil require.Equal(t, tt, out) } @@ -303,11 +303,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", value1) - require.Nil(b, err) + require.NoError(b, err) var val string err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -353,11 +353,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", value2) - require.Nil(b, err) + require.NoError(b, err) var val obj err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -436,11 +436,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", user) - require.Nil(b, err) + require.NoError(b, err) var val model.User err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -469,11 +469,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", model.UserMap(uMap)) - require.Nil(b, err) + require.NoError(b, err) var val map[string]*model.User err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -549,11 +549,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", post) - require.Nil(b, err) + require.NoError(b, err) var val model.Post err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -573,11 +573,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", status) - require.Nil(b, err) + require.NoError(b, err) var val *model.Status err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) @@ -609,11 +609,11 @@ func BenchmarkLRU(b *testing.B) { InvalidateClusterEvent: "", }) err := l2.Set("test", &session) - require.Nil(b, err) + require.NoError(b, err) var val *model.Session err = l2.Get("test", &val) - require.Nil(b, err) + require.NoError(b, err) } }) } @@ -633,7 +633,7 @@ func TestLRURace(t *testing.T) { defer wg.Done() value1 := "simplestring" err := l2.Set("test", value1) - require.Nil(t, err) + require.NoError(t, err) }() go func() { @@ -641,7 +641,7 @@ func TestLRURace(t *testing.T) { var val string err := l2.Get("test", &val) - require.Nil(t, err) + require.NoError(t, err) }() wg.Wait() diff --git a/services/cache/provider_test.go b/services/cache/provider_test.go index a8fdbf60a4..8a4dc8235a 100644 --- a/services/cache/provider_test.go +++ b/services/cache/provider_test.go @@ -178,8 +178,8 @@ func TestConnectClose(t *testing.T) { p := NewProvider() err := p.Connect() - require.Nil(t, err) + require.NoError(t, err) err = p.Close() - require.Nil(t, err) + require.NoError(t, err) } diff --git a/services/docextractor/docextractor_test.go b/services/docextractor/docextractor_test.go index 9b8f02caee..78533decaf 100644 --- a/services/docextractor/docextractor_test.go +++ b/services/docextractor/docextractor_test.go @@ -110,7 +110,7 @@ func TestExtract(t *testing.T) { for _, tc := range testCases { t.Run(tc.Name, func(t *testing.T) { data, err := testutils.ReadTestFile(tc.TestFileName) - require.Nil(t, err) + require.NoError(t, err) text, err := Extract(tc.TestFileName, bytes.NewReader(data), tc.Settings) if tc.ExpectError { require.Error(t, err) @@ -128,7 +128,7 @@ func TestExtract(t *testing.T) { t.Run("Unsupported binary file", func(t *testing.T) { data, err := testutils.ReadTestFile("testjpg.jpg") - require.Nil(t, err) + require.NoError(t, err) text, err := Extract("testjpg.jpg", bytes.NewReader(data), ExtractSettings{}) require.NoError(t, err) require.Equal(t, "", text) @@ -136,7 +136,7 @@ func TestExtract(t *testing.T) { t.Run("Wrong extension", func(t *testing.T) { data, err := testutils.ReadTestFile("sample-doc.pdf") - require.Nil(t, err) + require.NoError(t, err) text, err := Extract("sample-doc.docx", bytes.NewReader(data), ExtractSettings{}) require.NoError(t, err) require.Equal(t, "", text) @@ -166,7 +166,7 @@ func (te *failingExtractor) Extract(filename string, r io.Reader) (string, error func TestExtractWithExtraExtractors(t *testing.T) { t.Run("overrite existing extractor", func(t *testing.T) { data, err := testutils.ReadTestFile("sample-doc.pdf") - require.Nil(t, err) + require.NoError(t, err) text, err := ExtractWithExtraExtractors("sample-doc.pdf", bytes.NewReader(data), ExtractSettings{}, []Extractor{&customTestPdfExtractor{}}) require.NoError(t, err) @@ -175,7 +175,7 @@ func TestExtractWithExtraExtractors(t *testing.T) { t.Run("failing extractor", func(t *testing.T) { data, err := testutils.ReadTestFile("sample-doc.pdf") - require.Nil(t, err) + require.NoError(t, err) text, err := ExtractWithExtraExtractors("sample-doc.pdf", bytes.NewReader(data), ExtractSettings{}, []Extractor{&failingExtractor{}}) require.NoError(t, err) diff --git a/services/filesstore/filesstore_test.go b/services/filesstore/filesstore_test.go index 3f500551f4..92193f7ee9 100644 --- a/services/filesstore/filesstore_test.go +++ b/services/filesstore/filesstore_test.go @@ -89,7 +89,7 @@ func (s *FileBackendTestSuite) SetupTest() { utils.TranslationsPreInit() backend, err := NewFileBackend(&s.settings, true) - require.Nil(s.T(), err) + require.NoError(s.T(), err) s.backend = backend // This is needed to create the bucket if it doesn't exist. @@ -441,10 +441,10 @@ func BenchmarkS3WriteFile(b *testing.B) { } backend, err := NewFileBackend(settings, true) - require.Nil(b, err) + require.NoError(b, err) // This is needed to create the bucket if it doesn't exist. - require.Nil(b, backend.TestConnection()) + require.NoError(b, backend.TestConnection()) path := "tests/" + model.NewId() size := 1 * 1024 * 1024 @@ -455,7 +455,7 @@ func BenchmarkS3WriteFile(b *testing.B) { for i := 0; i < b.N; i++ { written, err := backend.WriteFile(bytes.NewReader(data), path) defer backend.RemoveFile(path) - require.Nil(b, err) + require.NoError(b, err) require.Equal(b, len(data), int(written)) } diff --git a/services/filesstore/s3store_test.go b/services/filesstore/s3store_test.go index ddfc48e2d5..51e37b3ce8 100644 --- a/services/filesstore/s3store_test.go +++ b/services/filesstore/s3store_test.go @@ -15,16 +15,16 @@ func TestCheckMandatoryS3Fields(t *testing.T) { cfg := model.FileSettings{} err := CheckMandatoryS3Fields(&cfg) - require.NotNil(t, err) + require.Error(t, err) require.Equal(t, err.Error(), "missing s3 bucket settings", "should've failed with missing s3 bucket") cfg.AmazonS3Bucket = model.NewString("test-mm") err = CheckMandatoryS3Fields(&cfg) - require.Nil(t, err) + require.NoError(t, err) cfg.AmazonS3Endpoint = model.NewString("") err = CheckMandatoryS3Fields(&cfg) - require.Nil(t, err) + require.NoError(t, err) require.Equal(t, *cfg.AmazonS3Endpoint, "s3.amazonaws.com", "should've set the endpoint to the default") } diff --git a/services/httpservice/client_test.go b/services/httpservice/client_test.go index 99de4193b6..8b72764918 100644 --- a/services/httpservice/client_test.go +++ b/services/httpservice/client_test.go @@ -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) } diff --git a/services/imageproxy/atmos_camo_test.go b/services/imageproxy/atmos_camo_test.go index d3dd4befd0..9d9393cd05 100644 --- a/services/imageproxy/atmos_camo_test.go +++ b/services/imageproxy/atmos_camo_test.go @@ -80,7 +80,7 @@ func TestAtmosCamoBackend_GetImageDirect(t *testing.T) { body, contentType, err := backend.GetImageDirect("https://example.com/image.png") - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "image/png", contentType) require.NotNil(t, body) diff --git a/services/imageproxy/local_test.go b/services/imageproxy/local_test.go index e7d57ded95..80a054b3f3 100644 --- a/services/imageproxy/local_test.go +++ b/services/imageproxy/local_test.go @@ -213,7 +213,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png") - assert.Nil(t, err) + assert.NoError(t, err) assert.Equal(t, "image/png", contentType) respBody, _ := ioutil.ReadAll(body) @@ -232,7 +232,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/file.pdf") - assert.NotNil(t, err) + assert.Error(t, err) assert.Equal(t, "", contentType) assert.Equal(t, ErrLocalRequestFailed, err) assert.Nil(t, body) @@ -255,7 +255,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/file.pdf") - assert.NotNil(t, err) + assert.Error(t, err) assert.Equal(t, "", contentType) assert.Equal(t, ErrLocalRequestFailed, err) assert.Nil(t, body) @@ -273,7 +273,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png") - assert.NotNil(t, err) + assert.Error(t, err) assert.Equal(t, "", contentType) assert.Equal(t, ErrLocalRequestFailed, err) assert.Nil(t, body) @@ -291,7 +291,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png") - assert.NotNil(t, err) + assert.Error(t, err) assert.Equal(t, "", contentType) assert.Equal(t, ErrLocalRequestFailed, err) assert.Nil(t, body) @@ -314,7 +314,7 @@ func TestLocalBackend_GetImageDirect(t *testing.T) { body, contentType, err := proxy.GetImageDirect(mock.URL + "/image.png") - assert.NotNil(t, err) + assert.Error(t, err) assert.Equal(t, "", contentType) assert.Equal(t, ErrLocalRequestFailed, err) assert.Nil(t, body) diff --git a/services/mailservice/mail_test.go b/services/mailservice/mail_test.go index 24950cc4dd..98d4715f7a 100644 --- a/services/mailservice/mail_test.go +++ b/services/mailservice/mail_test.go @@ -31,18 +31,18 @@ func TestMailConnectionFromConfig(t *testing.T) { cfg := store.Get() conn, err := ConnectToSMTPServer(cfg) - require.Nil(t, err, "Should connect to the SMTP Server %v", err) + require.NoError(t, err, "Should connect to the SMTP Server %v", err) _, err = NewSMTPClient(context.Background(), conn, cfg) - require.Nil(t, err, "Should get new SMTP client") + require.NoError(t, err, "Should get new SMTP client") *cfg.EmailSettings.SMTPServer = "wrongServer" *cfg.EmailSettings.SMTPPort = "553" _, err = ConnectToSMTPServer(cfg) - require.NotNil(t, err, "Should not connect to the SMTP Server") + require.Error(t, err, "Should not connect to the SMTP Server") } func TestMailConnectionAdvanced(t *testing.T) { @@ -58,7 +58,7 @@ func TestMailConnectionAdvanced(t *testing.T) { SmtpPort: *cfg.EmailSettings.SMTPPort, }, ) - require.Nil(t, err, "Should connect to the SMTP Server") + require.NoError(t, err, "Should connect to the SMTP Server") defer conn.Close() _, err2 := NewSMTPClientAdvanced( @@ -77,10 +77,10 @@ func TestMailConnectionAdvanced(t *testing.T) { SmtpServerTimeout: 1, }, ) - require.Nil(t, err2, "Should get new SMTP client") + require.NoError(t, err2, "Should get new SMTP client") l, err3 := net.Listen("tcp", "localhost:") // emulate nc -l - require.Nil(t, err3, "Should've open a network socket and listen") + require.NoError(t, err3, "Should've open a network socket and listen") defer l.Close() connInfo := &SmtpConnectionInfo{ @@ -96,7 +96,7 @@ func TestMailConnectionAdvanced(t *testing.T) { } conn2, err := ConnectToSMTPServerAdvanced(connInfo) - require.Nil(t, err, "Should connect to the SMTP Server") + require.NoError(t, err, "Should connect to the SMTP Server") defer conn2.Close() ctx := context.Background() @@ -109,7 +109,7 @@ func TestMailConnectionAdvanced(t *testing.T) { utils.GetHostnameFromSiteURL(*cfg.ServiceSettings.SiteURL), connInfo, ) - require.NotNil(t, err4, "Should get a timeout get while creating a new SMTP client") + require.Error(t, err4, "Should get a timeout get while creating a new SMTP client") assert.Contains(t, err4.Error(), "unable to connect to the SMTP server") _, err5 := ConnectToSMTPServerAdvanced( @@ -121,16 +121,16 @@ func TestMailConnectionAdvanced(t *testing.T) { SmtpPort: "553", }, ) - require.NotNil(t, err5, "Should not connect to the SMTP Server") + require.Error(t, err5, "Should not connect to the SMTP Server") } func TestSendMailUsingConfig(t *testing.T) { utils.T = utils.GetUserTranslations("en") fsInner, err := config.NewFileStore("config.json", false) - require.Nil(t, err) + require.NoError(t, err) fs, err := config.NewStoreFromBacking(fsInner, nil, false) - require.Nil(t, err) + require.NoError(t, err) cfg := fs.Get() @@ -143,7 +143,7 @@ func TestSendMailUsingConfig(t *testing.T) { DeleteMailBox(emailTo) err2 := SendMailUsingConfig(emailTo, emailSubject, emailBody, cfg, true, emailCC) - require.Nil(t, err2, "Should connect to the SMTP Server") + require.NoError(t, err2, "Should connect to the SMTP Server") //Check if the email was send to the right email address var resultsMailbox JSONMessageHeaderInbucket @@ -159,7 +159,7 @@ func TestSendMailUsingConfig(t *testing.T) { if len(resultsMailbox) > 0 { require.Contains(t, resultsMailbox[0].To[0], emailTo, "Wrong To: recipient") resultsEmail, err := GetMessageFromMailbox(emailTo, resultsMailbox[0].ID) - require.Nil(t, err, "Could not get message from mailbox") + require.NoError(t, err, "Could not get message from mailbox") require.Contains(t, emailBody, resultsEmail.Body.Text, "Wrong received message %s", resultsEmail.Body.Text) } } @@ -169,9 +169,9 @@ func TestSendMailWithEmbeddedFilesUsingConfig(t *testing.T) { utils.T = utils.GetUserTranslations("en") fsInner, err := config.NewFileStore("config.json", false) - require.Nil(t, err) + require.NoError(t, err) fs, err := config.NewStoreFromBacking(fsInner, nil, false) - require.Nil(t, err) + require.NoError(t, err) cfg := fs.Get() @@ -188,7 +188,7 @@ func TestSendMailWithEmbeddedFilesUsingConfig(t *testing.T) { "test2.png": bytes.NewReader([]byte("xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx")), } err2 := SendMailWithEmbeddedFilesUsingConfig(emailTo, emailSubject, emailBody, embeddedFiles, cfg, true, emailCC) - require.Nil(t, err2, "Should connect to the SMTP Server") + require.NoError(t, err2, "Should connect to the SMTP Server") //Check if the email was send to the right email address var resultsMailbox JSONMessageHeaderInbucket @@ -204,7 +204,7 @@ func TestSendMailWithEmbeddedFilesUsingConfig(t *testing.T) { if len(resultsMailbox) > 0 { require.Contains(t, resultsMailbox[0].To[0], emailTo, "Wrong To: recipient") resultsEmail, err := GetMessageFromMailbox(emailTo, resultsMailbox[0].ID) - require.Nil(t, err, "Could not get message from mailbox") + require.NoError(t, err, "Could not get message from mailbox") require.Contains(t, emailBody, resultsEmail.Body.Text, "Wrong received message %s", resultsEmail.Body.Text) // Usign the message size because the inbucket API doesn't return embedded attachments through the API require.Greater(t, resultsEmail.Size, 1500, "the file size should be more because the embedded attachemtns") @@ -216,9 +216,9 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) { utils.T = utils.GetUserTranslations("en") fsInner, err := config.NewFileStore("config.json", false) - require.Nil(t, err) + require.NoError(t, err) fs, err := config.NewStoreFromBacking(fsInner, nil, false) - require.Nil(t, err) + require.NoError(t, err) cfg := fs.Get() @@ -226,7 +226,7 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) { DeleteMailBox("test2@example.com") fileBackend, err := filesstore.NewFileBackend(&cfg.FileSettings, true) - assert.Nil(t, err) + assert.NoError(t, err) // create two files with the same name that will both be attached to the email filePath1 := fmt.Sprintf("test1/%s", "file1.txt") @@ -234,9 +234,9 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) { fileContents1 := []byte("hello world") fileContents2 := []byte("foo bar") _, err = fileBackend.WriteFile(bytes.NewReader(fileContents1), filePath1) - assert.Nil(t, err) + assert.NoError(t, err) _, err = fileBackend.WriteFile(bytes.NewReader(fileContents2), filePath2) - assert.Nil(t, err) + assert.NoError(t, err) defer fileBackend.RemoveFile(filePath1) defer fileBackend.RemoveFile(filePath2) @@ -270,7 +270,7 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) { } err = sendMailUsingConfigAdvanced(mail, cfg, true) - require.Nil(t, err, "Should connect to the STMP Server: %v", err) + require.NoError(t, err, "Should connect to the STMP Server: %v", err) //Check if the email was send to the right email address var resultsMailbox JSONMessageHeaderInbucket @@ -279,13 +279,13 @@ func TestSendMailUsingConfigAdvanced(t *testing.T) { resultsMailbox, mailErr = GetMailBox(mail.smtpTo) return mailErr }) - require.Nil(t, err, "No emails found for address %s. error: %v", mail.smtpTo, err) + require.NoError(t, err, "No emails found for address %s. error: %v", mail.smtpTo, err) require.NotEqual(t, len(resultsMailbox), 0) require.Contains(t, resultsMailbox[0].To[0], mail.mimeTo, "Wrong To recipient") resultsEmail, err := GetMessageFromMailbox(mail.smtpTo, resultsMailbox[0].ID) - require.Nil(t, err) + require.NoError(t, err) require.Contains(t, mail.htmlBody, resultsEmail.Body.Text, "Wrong received message") @@ -392,14 +392,14 @@ func (m *mockMailer) Close() error { return nil } func TestSendMail(t *testing.T) { dir, err := ioutil.TempDir(".", "mail-test-") - require.Nil(t, err) + require.NoError(t, err) defer os.RemoveAll(dir) settings := model.FileSettings{ DriverName: model.NewString(model.IMAGE_DRIVER_LOCAL), Directory: &dir, } - mockBackend, appErr := filesstore.NewFileBackend(&settings, true) - require.Nil(t, appErr) + mockBackend, err := filesstore.NewFileBackend(&settings, true) + require.NoError(t, err) mocm := &mockMailer{} testCases := map[string]struct { @@ -422,8 +422,8 @@ func TestSendMail(t *testing.T) { for testName, tc := range testCases { t.Run(testName, func(t *testing.T) { mail := mailData{"", "", mail.Address{}, "", tc.replyTo, "", "", nil, nil, nil} - appErr = SendMail(mocm, mail, mockBackend, time.Now()) - require.Nil(t, appErr) + err = SendMail(mocm, mail, mockBackend, time.Now()) + require.NoError(t, err) if tc.contains != "" { require.Contains(t, string(mocm.data), tc.contains) } diff --git a/services/searchengine/bleveengine/bleve_test.go b/services/searchengine/bleveengine/bleve_test.go index 5748f109d4..bc1f90c7c7 100644 --- a/services/searchengine/bleveengine/bleve_test.go +++ b/services/searchengine/bleveengine/bleve_test.go @@ -125,10 +125,10 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() { s.SearchEngine.BleveEngine.DeleteChannelPosts(channelID) doc, err := s.BleveEngine.PostIndex.Document(postToAvoid.Id) - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), postToAvoid.Id, doc.ID) numberDocs, err := s.BleveEngine.PostIndex.DocCount() - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 1, int(numberDocs)) }) @@ -145,9 +145,9 @@ func (s *BleveEngineTestSuite) TestDeleteChannelPosts() { s.SearchEngine.BleveEngine.DeleteChannelPosts(channelToDeleteID) _, err := s.BleveEngine.PostIndex.Document(post.Id) - require.Nil(s.T(), err) + require.NoError(s.T(), err) numberDocs, err := s.BleveEngine.PostIndex.DocCount() - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 1, int(numberDocs)) }) } @@ -173,10 +173,10 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() { s.SearchEngine.BleveEngine.DeleteUserPosts(userID) doc, err := s.BleveEngine.PostIndex.Document(postToAvoid.Id) - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), postToAvoid.Id, doc.ID) numberDocs, err := s.BleveEngine.PostIndex.DocCount() - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 1, int(numberDocs)) }) @@ -193,9 +193,9 @@ func (s *BleveEngineTestSuite) TestDeleteUserPosts() { s.SearchEngine.BleveEngine.DeleteUserPosts(userToDeleteID) _, err := s.BleveEngine.PostIndex.Document(post.Id) - require.Nil(s.T(), err) + require.NoError(s.T(), err) numberDocs, err := s.BleveEngine.PostIndex.DocCount() - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 1, int(numberDocs)) }) } @@ -221,13 +221,13 @@ func (s *BleveEngineTestSuite) TestDeletePosts() { query.SetField("UserId") search := bleve.NewSearchRequest(query) count, err := s.BleveEngine.deletePosts(search, 1) - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 10, int(count)) doc, err := s.BleveEngine.PostIndex.Document(postToAvoid.Id) - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), postToAvoid.Id, doc.ID) numberDocs, err := s.BleveEngine.PostIndex.DocCount() - require.Nil(s.T(), err) + require.NoError(s.T(), err) require.Equal(s.T(), 1, int(numberDocs)) } diff --git a/services/upgrader/upgrader_linux_test.go b/services/upgrader/upgrader_linux_test.go index c962de2972..335b303a1c 100644 --- a/services/upgrader/upgrader_linux_test.go +++ b/services/upgrader/upgrader_linux_test.go @@ -76,12 +76,12 @@ func TestGetCurrentVersionTgzUrl(t *testing.T) { func TestExtractBinary(t *testing.T) { t.Run("extract from empty file", func(t *testing.T) { tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockTarGz.Name()) tmpMockTarGz.Close() tmpMockExecutable, err := ioutil.TempFile("", "mock_exe") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockExecutable.Name()) tmpMockExecutable.Close() @@ -90,7 +90,7 @@ func TestExtractBinary(t *testing.T) { t.Run("extract from empty tar.gz file", func(t *testing.T) { tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockTarGz.Name()) gz := gzip.NewWriter(tmpMockTarGz) tw := tar.NewWriter(gz) @@ -99,7 +99,7 @@ func TestExtractBinary(t *testing.T) { tmpMockTarGz.Close() tmpMockExecutable, err := ioutil.TempFile("", "mock_exe") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockExecutable.Name()) tmpMockExecutable.Close() @@ -108,7 +108,7 @@ func TestExtractBinary(t *testing.T) { t.Run("extract from tar.gz without mattermost/bin/mattermost file", func(t *testing.T) { tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockTarGz.Name()) gz := gzip.NewWriter(tmpMockTarGz) tw := tar.NewWriter(gz) @@ -124,7 +124,7 @@ func TestExtractBinary(t *testing.T) { tmpMockTarGz.Close() tmpMockExecutable, err := ioutil.TempFile("", "mock_exe") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockExecutable.Name()) tmpMockExecutable.Close() @@ -133,7 +133,7 @@ func TestExtractBinary(t *testing.T) { t.Run("extract from tar.gz with mattermost/bin/mattermost file", func(t *testing.T) { tmpMockTarGz, err := ioutil.TempFile("", "mock_tgz") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockTarGz.Name()) gz := gzip.NewWriter(tmpMockTarGz) tw := tar.NewWriter(gz) @@ -149,7 +149,7 @@ func TestExtractBinary(t *testing.T) { tmpMockTarGz.Close() tmpMockExecutable, err := ioutil.TempFile("", "mock_exe") - require.Nil(t, err) + require.NoError(t, err) defer os.Remove(tmpMockExecutable.Name()) tmpMockExecutable.Close()