From f6e69e86bb7a60faa89f498f476d50cb7030d86a Mon Sep 17 00:00:00 2001 From: Umputun Date: Tue, 25 Jun 2019 19:35:21 -0500 Subject: [PATCH] lint: test warnings --- backend/app/cmd/server.go | 2 +- backend/app/{store => }/remote/client.go | 0 backend/app/{store => }/remote/client_test.go | 3 +++ backend/app/{store => }/remote/remote.go | 0 backend/app/{store => }/remote/server.go | 0 backend/app/{store => }/remote/server_test.go | 14 +++++++------- backend/app/store/admin/remote.go | 2 +- backend/app/store/admin/remote_test.go | 2 +- backend/app/store/engine/bolt_test.go | 12 ++++++------ backend/app/store/engine/remote.go | 2 +- backend/app/store/engine/remote_test.go | 2 +- backend/app/store/service/service_test.go | 6 +++--- 12 files changed, 24 insertions(+), 21 deletions(-) rename backend/app/{store => }/remote/client.go (100%) rename backend/app/{store => }/remote/client_test.go (97%) rename backend/app/{store => }/remote/remote.go (100%) rename backend/app/{store => }/remote/server.go (100%) rename backend/app/{store => }/remote/server_test.go (96%) diff --git a/backend/app/cmd/server.go b/backend/app/cmd/server.go index 40aeb435..ced3ac78 100644 --- a/backend/app/cmd/server.go +++ b/backend/app/cmd/server.go @@ -26,13 +26,13 @@ import ( "github.com/umputun/remark/backend/app/migrator" "github.com/umputun/remark/backend/app/notify" + "github.com/umputun/remark/backend/app/remote" "github.com/umputun/remark/backend/app/rest/api" "github.com/umputun/remark/backend/app/rest/proxy" "github.com/umputun/remark/backend/app/store" "github.com/umputun/remark/backend/app/store/admin" "github.com/umputun/remark/backend/app/store/engine" "github.com/umputun/remark/backend/app/store/image" - "github.com/umputun/remark/backend/app/store/remote" "github.com/umputun/remark/backend/app/store/service" ) diff --git a/backend/app/store/remote/client.go b/backend/app/remote/client.go similarity index 100% rename from backend/app/store/remote/client.go rename to backend/app/remote/client.go diff --git a/backend/app/store/remote/client_test.go b/backend/app/remote/client_test.go similarity index 97% rename from backend/app/store/remote/client_test.go rename to backend/app/remote/client_test.go index 59799031..717b26ca 100644 --- a/backend/app/store/remote/client_test.go +++ b/backend/app/remote/client_test.go @@ -21,6 +21,7 @@ func TestClient_Call(t *testing.T) { assert.NoError(t, err) res := "" err = json.Unmarshal(*resp.Result, &res) + assert.NoError(t, err) assert.Equal(t, "12345", res) t.Logf("%v %T", res, res) } @@ -43,6 +44,7 @@ func TestClient_CallWithObject(t *testing.T) { assert.NoError(t, err) res := "" err = json.Unmarshal(*resp.Result, &res) + assert.NoError(t, err) assert.Equal(t, "12345", res) t.Logf("%v %T", res, res) } @@ -55,6 +57,7 @@ func TestClient_CallWithNoParams(t *testing.T) { assert.NoError(t, err) res := "" err = json.Unmarshal(*resp.Result, &res) + assert.NoError(t, err) assert.Equal(t, "12345", res) t.Logf("%v %T", res, res) } diff --git a/backend/app/store/remote/remote.go b/backend/app/remote/remote.go similarity index 100% rename from backend/app/store/remote/remote.go rename to backend/app/remote/remote.go diff --git a/backend/app/store/remote/server.go b/backend/app/remote/server.go similarity index 100% rename from backend/app/store/remote/server.go rename to backend/app/remote/server.go diff --git a/backend/app/store/remote/server_test.go b/backend/app/remote/server_test.go similarity index 96% rename from backend/app/store/remote/server_test.go rename to backend/app/remote/server_test.go index 49342c99..a2e87e87 100644 --- a/backend/app/store/remote/server_test.go +++ b/backend/app/remote/server_test.go @@ -39,8 +39,8 @@ func TestServerPrimitiveTypes(t *testing.T) { return r }) - go func() { s.Run(9091) }() - defer func() { assert.NoError(t, s.Shutdown()) }() + go func() { _ = s.Run(9091) }() + defer func() { s.Shutdown() }() time.Sleep(10 * time.Millisecond) // check with direct http call @@ -93,7 +93,7 @@ func TestServerWithObject(t *testing.T) { return r }) - go func() { s.Run(9091) }() + go func() { _ = s.Run(9091) }() defer func() { assert.NoError(t, s.Shutdown()) }() time.Sleep(10 * time.Millisecond) @@ -145,7 +145,7 @@ func TestServerWithAuth(t *testing.T) { return r }) - go func() { s.Run(9091) }() + go func() { _ = s.Run(9091) }() time.Sleep(10 * time.Millisecond) defer func() { assert.NoError(t, s.Shutdown()) }() @@ -183,7 +183,7 @@ func TestServerErrReturn(t *testing.T) { return r }) - go func() { s.Run(9091) }() + go func() { _ = s.Run(9091) }() defer func() { assert.NoError(t, s.Shutdown()) }() time.Sleep(10 * time.Millisecond) @@ -202,7 +202,7 @@ func TestServerGroup(t *testing.T) { return Response{} }, }) - go func() { s.Run(9091) }() + go func() { _ = s.Run(9091) }() defer func() { assert.NoError(t, s.Shutdown()) }() time.Sleep(10 * time.Millisecond) @@ -221,7 +221,7 @@ func TestServerAddLate(t *testing.T) { s.Add("fn1", func(id uint64, params json.RawMessage) Response { return Response{} }) - go func() { s.Run(9091) }() + go func() { _ = s.Run(9091) }() defer func() { assert.NoError(t, s.Shutdown()) }() time.Sleep(10 * time.Millisecond) diff --git a/backend/app/store/admin/remote.go b/backend/app/store/admin/remote.go index 1ba1805c..6cef97c6 100644 --- a/backend/app/store/admin/remote.go +++ b/backend/app/store/admin/remote.go @@ -9,7 +9,7 @@ package admin import ( "encoding/json" - "github.com/umputun/remark/backend/app/store/remote" + "github.com/umputun/remark/backend/app/remote" ) // Remote implements remote engine and delegates all Calls to remote http server diff --git a/backend/app/store/admin/remote_test.go b/backend/app/store/admin/remote_test.go index e39fdfc7..4b67db0d 100644 --- a/backend/app/store/admin/remote_test.go +++ b/backend/app/store/admin/remote_test.go @@ -16,7 +16,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "github.com/umputun/remark/backend/app/store/remote" + "github.com/umputun/remark/backend/app/remote" ) func TestRemote_Key(t *testing.T) { diff --git a/backend/app/store/engine/bolt_test.go b/backend/app/store/engine/bolt_test.go index 588fb2e9..5a284ef3 100644 --- a/backend/app/store/engine/bolt_test.go +++ b/backend/app/store/engine/bolt_test.go @@ -19,8 +19,7 @@ func TestBoltDB_CreateAndFind(t *testing.T) { var b, teardown = prep(t) defer teardown() - var bb Interface - bb = b + var bb Interface = b _ = bb req := FindRequest{Locator: store.Locator{URL: "https://radio-t.com", SiteID: "radio-t"}, Sort: "time"} @@ -117,8 +116,8 @@ func TestBoltDB_Update(t *testing.T) { err = b.Update(comment) assert.EqualError(t, err, `site "bad" not found`) - comment.Locator.SiteID="radio-t" - comment.Locator.URL="https://radio-t.com-bad" + comment.Locator.SiteID = "radio-t" + comment.Locator.URL = "https://radio-t.com-bad" err = b.Update(comment) assert.EqualError(t, err, `no bucket https://radio-t.com-bad in store`) } @@ -451,6 +450,7 @@ func TestBolt_FlagReadOnlyPost(t *testing.T) { req = FlagRequest{Locator: store.Locator{SiteID: "radio-t", URL: "url-1"}, Flag: ReadOnly, Update: FlagTrue} val, err = b.Flag(req) assert.NoError(t, err) + assert.Equal(t, true, val) req = FlagRequest{Locator: store.Locator{SiteID: "radio-t", URL: "url-1"}, Flag: ReadOnly} val, err = b.Flag(req) assert.NoError(t, err) @@ -816,7 +816,7 @@ func prep(t *testing.T) (b *BoltDB, teardown func()) { func getReq(locator store.Locator, commentID string) GetRequest { return GetRequest{ - Locator: locator, + Locator: locator, CommentID: commentID, } -} \ No newline at end of file +} diff --git a/backend/app/store/engine/remote.go b/backend/app/store/engine/remote.go index fe3f1b70..f9b8b16b 100644 --- a/backend/app/store/engine/remote.go +++ b/backend/app/store/engine/remote.go @@ -3,8 +3,8 @@ package engine import ( "encoding/json" + "github.com/umputun/remark/backend/app/remote" "github.com/umputun/remark/backend/app/store" - "github.com/umputun/remark/backend/app/store/remote" ) // Remote implements remote engine and delegates all Calls to remote http server diff --git a/backend/app/store/engine/remote_test.go b/backend/app/store/engine/remote_test.go index 7b206e43..459e3705 100644 --- a/backend/app/store/engine/remote_test.go +++ b/backend/app/store/engine/remote_test.go @@ -12,8 +12,8 @@ import ( "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "github.com/umputun/remark/backend/app/remote" "github.com/umputun/remark/backend/app/store" - "github.com/umputun/remark/backend/app/store/remote" ) func TestRemote_Create(t *testing.T) { diff --git a/backend/app/store/service/service_test.go b/backend/app/store/service/service_test.go index d9eb5012..8d6a4c0e 100644 --- a/backend/app/store/service/service_test.go +++ b/backend/app/store/service/service_test.go @@ -957,7 +957,7 @@ func TestService_UserCount(t *testing.T) { assert.NoError(t, err) assert.Equal(t, 1, c) - c, err = b.UserCount("radio-t", "userBad") + _, err = b.UserCount("radio-t", "userBad") assert.EqualError(t, err, "no comments for user userBad in store for radio-t site") } @@ -1082,7 +1082,7 @@ func teardown(_ *testing.T) { func getReq(locator store.Locator, commentID string) engine.GetRequest { return engine.GetRequest{ - Locator: locator, + Locator: locator, CommentID: commentID, } -} \ No newline at end of file +}