From 365bc662a29e69f1927f1b95accfb5e6651fe6c8 Mon Sep 17 00:00:00 2001 From: Alex Kohler Date: Mon, 12 Feb 2018 06:16:06 -0500 Subject: [PATCH] Enable gometalinter on tests and fix static analysis issues #631 (#644) * Enable gometalinter on tests and fix static analysis issues * Remove unneeded change * Fix additional lint errors * Add nolint directives and error checks * Add error assertions instead of nolint directives * Go back to using lint directive for loop.Run goroutine * Add error check to loop.Run --- .gometalinter.json | 1 + geth/jail/cell_test.go | 8 ++++++-- geth/jail/internal/loop/loop_test.go | 5 ++++- geth/mailservice/mailservice_api_test.go | 5 ++++- metrics/node/subscribe_test.go | 5 ++++- profiling/profiling_test.go | 10 ++++++++-- t/e2e/whisper/mailservice_test.go | 5 ++++- t/e2e/whisper/whisper_mailbox_test.go | 12 ++++++++---- 8 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.gometalinter.json b/.gometalinter.json index 3d7fcdf8e..c65081f27 100644 --- a/.gometalinter.json +++ b/.gometalinter.json @@ -5,6 +5,7 @@ ], "Skip": ["helpers", "static"], "Vendor": true, + "Test": true, "Enable": [ "deadcode", "errcheck", diff --git a/geth/jail/cell_test.go b/geth/jail/cell_test.go index 9da8a21cc..a5f076f0d 100644 --- a/geth/jail/cell_test.go +++ b/geth/jail/cell_test.go @@ -151,7 +151,10 @@ func (s *CellTestSuite) TestCellFetchErrorRace() { // Find a free port in localhost freeportListener, err := net.Listen("tcp", "127.0.0.1:0") s.Require().NoError(err) - defer freeportListener.Close() + defer func() { + err := freeportListener.Close() + s.NoError(err) + }() // Send an HTTP request to the free port that we found above _, err = cell.Run(fmt.Sprintf(`fetch('%s').then(function(r) { @@ -237,7 +240,8 @@ func (s *CellTestSuite) TestCellCallAsync() { fn, err := s.cell.Get("testCallAsync") s.NoError(err) - s.cell.CallAsync(fn, "success") + err = s.cell.CallAsync(fn, "success") + s.NoError(err) s.Equal("success", <-datac) } diff --git a/geth/jail/internal/loop/loop_test.go b/geth/jail/internal/loop/loop_test.go index a552d6bad..e7f5c58c7 100644 --- a/geth/jail/internal/loop/loop_test.go +++ b/geth/jail/internal/loop/loop_test.go @@ -53,7 +53,10 @@ func (s *LoopSuite) SetupTest() { ctx, cancel := context.WithCancel(context.Background()) s.cancel = cancel - go s.loop.Run(ctx) + go func() { + err := s.loop.Run(ctx) + s.Equal(context.Canceled, err) + }() } func (s *LoopSuite) TestAddAndReady() { diff --git a/geth/mailservice/mailservice_api_test.go b/geth/mailservice/mailservice_api_test.go index a53fb2fcc..c0a4db919 100644 --- a/geth/mailservice/mailservice_api_test.go +++ b/geth/mailservice/mailservice_api_test.go @@ -27,7 +27,10 @@ func TestRequestMessagesFailures(t *testing.T) { nodeA, nodeErr := node.New(&node.Config{NoUSB: true}) require.NoError(t, nodeErr) require.NoError(t, nodeA.Start()) - defer nodeA.Stop() + defer func() { + err := nodeA.Stop() + require.NoError(t, err) + }() const ( mailServerPeer = "enode://b7e65e1bedc2499ee6cbd806945af5e7df0e59e4070c96821570bd581473eade24a489f5ec95d060c0db118c879403ab88d827d3766978f28708989d35474f87@[::]:51920" diff --git a/metrics/node/subscribe_test.go b/metrics/node/subscribe_test.go index 8259ff339..8c86aa5e1 100644 --- a/metrics/node/subscribe_test.go +++ b/metrics/node/subscribe_test.go @@ -19,7 +19,10 @@ func TestSubscribeServerEvents(t *testing.T) { require.NoError(t, err) err = node.Start() require.NoError(t, err) - defer node.Stop() + defer func() { + err := node.Stop() + require.NoError(t, err) + }() ctx, cancel := context.WithCancel(context.Background()) done := make(chan struct{}) diff --git a/profiling/profiling_test.go b/profiling/profiling_test.go index 4c3d4d3bf..5b639defe 100644 --- a/profiling/profiling_test.go +++ b/profiling/profiling_test.go @@ -26,7 +26,10 @@ func TestProfilingCPU(t *testing.T) { // Verify that the file has some content. file, err := os.Open(filepath.Join(dir, CPUFilename)) require.NoError(t, err) - defer file.Close() + defer func() { + err := file.Close() + require.NoError(t, err) + }() t.Logf("CPU profile saved in %s for %s", filepath.Join(dir, CPUFilename), os.Args[0]) @@ -45,7 +48,10 @@ func TestProfilingMem(t *testing.T) { // Verify that the file has some content. file, err := os.Open(filepath.Join(dir, MemFilename)) require.NoError(t, err) - defer file.Close() + defer func() { + err := file.Close() + require.NoError(t, err) + }() t.Logf("Memory profile saved in %s for %s", filepath.Join(dir, MemFilename), os.Args[0]) diff --git a/t/e2e/whisper/mailservice_test.go b/t/e2e/whisper/mailservice_test.go index 8768dce07..db2009d9b 100644 --- a/t/e2e/whisper/mailservice_test.go +++ b/t/e2e/whisper/mailservice_test.go @@ -53,7 +53,10 @@ func (s *MailServiceSuite) TestShhRequestMessagesRPCMethodAvailability() { r.NoError(err) resp, err := http.DefaultClient.Do(req) r.NoError(err) - defer resp.Body.Close() + defer func() { + err := resp.Body.Close() + r.NoError(err) + }() r.Equal(200, resp.StatusCode) data, err := ioutil.ReadAll(resp.Body) r.NoError(err) diff --git a/t/e2e/whisper/whisper_mailbox_test.go b/t/e2e/whisper/whisper_mailbox_test.go index 664499c1f..fc19591eb 100644 --- a/t/e2e/whisper/whisper_mailbox_test.go +++ b/t/e2e/whisper/whisper_mailbox_test.go @@ -213,7 +213,8 @@ func (s *WhisperMailboxSuite) TestRequestMessagesInGroupChat() { messages := s.getMessagesByMessageFilterID(bobRPCClient, bobMessageFilterID) s.Require().Equal(1, len(messages)) bobGroupChatData := groupChatParams{} - bobGroupChatData.Decode(messages[0]["payload"].(string)) + err = bobGroupChatData.Decode(messages[0]["payload"].(string)) + s.Require().NoError(err) s.EqualValues(groupChatPayload, bobGroupChatData) //2. bob add symkey to his node @@ -228,7 +229,8 @@ func (s *WhisperMailboxSuite) TestRequestMessagesInGroupChat() { messages = s.getMessagesByMessageFilterID(charlieRPCClient, charlieMessageFilterID) s.Require().Equal(1, len(messages)) charlieGroupChatData := groupChatParams{} - charlieGroupChatData.Decode(messages[0]["payload"].(string)) + err = charlieGroupChatData.Decode(messages[0]["payload"].(string)) + s.Require().NoError(err) s.EqualValues(groupChatPayload, charlieGroupChatData) //2. charlie add symkey to his node @@ -319,7 +321,8 @@ func (s *WhisperMailboxSuite) startBackend(name string) (*api.StatusBackend, fun s.True(backend.IsNodeRunning()) s.NoError(backend.StopNode()) s.False(backend.IsNodeRunning()) - os.RemoveAll(datadir) + err = os.RemoveAll(datadir) + s.Require().NoError(err) } } @@ -346,7 +349,8 @@ func (s *WhisperMailboxSuite) startMailboxBackend() (*api.StatusBackend, func()) s.True(mailboxBackend.IsNodeRunning()) s.NoError(mailboxBackend.StopNode()) s.False(mailboxBackend.IsNodeRunning()) - os.RemoveAll(datadir) + err = os.RemoveAll(datadir) + s.Require().NoError(err) } }