mirrors/remark42
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

golangci-lint fixes for memory_store tests

Browse Source
This commit is contained in:
Dmitry Verkhoturov
2020-04-21 11:47:15 +02:00
parent b4a6cc5473
commit 318feb8ed2
6 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/_example/memory_store/accessor/admin_test.go
+3
View File
@@ -47,9 +47,11 @@ func TestMemAdmin_Get(t *testing.T) {
admins, err = ms.Admins("no-site-in-db")
assert.EqualError(t, err, "site no-site-in-db not found")
assert.Empty(t, admins)
email, err = ms.Email("no-site-in-db")
assert.EqualError(t, err, "site no-site-in-db not found")
assert.Empty(t, email)
enabled, err := ms.Enabled("site1")
assert.NoError(t, err)
@@ -61,6 +63,7 @@ func TestMemAdmin_Get(t *testing.T) {
enabled, err = ms.Enabled("no-site-in-db")
assert.EqualError(t, err, "site no-site-in-db not found")
assert.False(t, enabled)
err = ms.OnEvent("site1", admin.EvCreate)
assert.NoError(t, err)
backend/_example/memory_store/accessor/data_test.go
+4 -3
View File
@@ -425,6 +425,7 @@ func TestMemData_FlagReadOnlyPost(t *testing.T) {
Update: engine.FlagTrue}
val, err = b.Flag(req)
assert.NoError(t, err)
assert.True(t, val)
req = engine.FlagRequest{Locator: store.Locator{SiteID: "radio-t", URL: "url-1"}, Flag: engine.ReadOnly}
val, err = b.Flag(req)
assert.NoError(t, err)
@@ -546,9 +547,9 @@ func TestMemData_FlagListBlocked(t *testing.T) {
assert.NoError(t, err)
blockedList := toBlocked(vv)
var blockedIds []string
for _, x := range blockedList {
blockedIds = append(blockedIds, x.ID)
var blockedIds = make([]string, len(blockedList))
for i, x := range blockedList {
blockedIds[i] = x.ID
}
require.Equal(t, 2, len(blockedList), b.metaUsers)
assert.ElementsMatch(t, []string{"user1", "user2"}, blockedIds)
backend/_example/memory_store/server/admin_test.go
+5 -5
View File
@@ -19,7 +19,7 @@ import (
)
func TestRPC_admKeyHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -30,7 +30,7 @@ func TestRPC_admKeyHndl(t *testing.T) {
}
func TestRPC_admAdminsHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -44,7 +44,7 @@ func TestRPC_admAdminsHndl(t *testing.T) {
}
func TestRPC_admEmailHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -58,7 +58,7 @@ func TestRPC_admEmailHndl(t *testing.T) {
}
func TestRPC_admEnabledHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -76,7 +76,7 @@ func TestRPC_admEnabledHndl(t *testing.T) {
}
func TestRPC_admEventHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
backend/_example/memory_store/server/data_test.go
+11 -11
View File
@@ -21,7 +21,7 @@ import (
)
func TestRPC_createHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -33,7 +33,7 @@ func TestRPC_createHndl(t *testing.T) {
}
func TestRPC_findHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -56,7 +56,7 @@ func TestRPC_findHndl(t *testing.T) {
}
func TestRPC_getHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -80,7 +80,7 @@ func TestRPC_getHndl(t *testing.T) {
}
func TestRPC_updateHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -108,7 +108,7 @@ func TestRPC_updateHndl(t *testing.T) {
}
func TestRPC_countHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -130,7 +130,7 @@ func TestRPC_countHndl(t *testing.T) {
}
func TestRPC_infoHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -151,7 +151,7 @@ func TestRPC_infoHndl(t *testing.T) {
}
func TestRPC_flagHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -186,7 +186,7 @@ func TestRPC_flagHndl(t *testing.T) {
}
func TestRPC_listFlagsHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -220,7 +220,7 @@ func TestRPC_listFlagsHndl(t *testing.T) {
}
func TestRPC_userDetailHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -273,7 +273,7 @@ func TestRPC_userDetailHndl(t *testing.T) {
}
func TestRPC_deleteHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -296,7 +296,7 @@ func TestRPC_deleteHndl(t *testing.T) {
}
func TestRPC_closeHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
backend/_example/memory_store/server/image_test.go
+4 -4
View File
@@ -51,7 +51,7 @@ func gopherPNGBytes() []byte {
}
func TestRPC_imgLoadHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -78,7 +78,7 @@ func TestRPC_imgLoadHndl(t *testing.T) {
assert.Equal(t, gopherPNGBytes(), img)
// cleanup
err = ri.Cleanup(nil, time.Second)
err = ri.Cleanup(context.TODO(), time.Second)
assert.NoError(t, err)
// load after cleanup
@@ -89,7 +89,7 @@ func TestRPC_imgLoadHndl(t *testing.T) {
}
func TestRPC_imgCommitHndlFail(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
@@ -99,7 +99,7 @@ func TestRPC_imgCommitHndlFail(t *testing.T) {
}
func TestRPC_imgCleanupHndl(t *testing.T) {
_, port, teardown := prepTestStore(t)
port, teardown := prepTestStore(t)
defer teardown()
api := fmt.Sprintf("http://localhost:%d/test", port)
backend/_example/memory_store/server/rpc_test.go
+3 -3
View File
@@ -43,11 +43,11 @@ func waitForHTTPServerStart(port int) {
}
}
func prepTestStore(t *testing.T) (s *RPC, port int, teardown func()) {
func prepTestStore(t *testing.T) (port int, teardown func()) {
mg := accessor.NewMemData()
adm := accessor.NewMemAdminStore("secret")
img := accessor.NewMemImageStore()
s = NewRPC(mg, adm, img, &jrpc.Server{API: "/test", Logger: jrpc.NoOpLogger})
s := NewRPC(mg, adm, img, &jrpc.Server{API: "/test", Logger: jrpc.NoOpLogger})
admRec := accessor.AdminRec{
SiteID: "test-site",
@@ -68,7 +68,7 @@ func prepTestStore(t *testing.T) (s *RPC, port int, teardown func()) {
waitForHTTPServerStart(port)
return s, port, func() {
return port, func() {
require.NoError(t, s.Shutdown())
}
}