Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remote/plugin support #353

Merged
merged 27 commits into from
Jun 26, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
1171e9d
wip: engine2 passing test with updates service
umputun Jun 8, 2019
29ffa57
restore all service coverage with new engine
umputun Jun 8, 2019
fa15fb1
make new engine primary, rename package
umputun Jun 9, 2019
1013b5d
Merge branch 'master' into remote
umputun Jun 9, 2019
a6a7448
remote client adjusted to new engine flavour
umputun Jun 9, 2019
625dbff
split remote to common protocol package and engine implemetation
umputun Jun 9, 2019
fa83c00
initial ver of remote server
umputun Jun 9, 2019
3f73a01
implement DeleteUser soft mode to allow mapping for blocked users #341
umputun Jun 10, 2019
05a3871
remote server covered with tests
umputun Jun 10, 2019
465571a
fix remote client tests with id
umputun Jun 10, 2019
0722e64
switch list flag to struct param
umputun Jun 11, 2019
a098d17
Merge remote-tracking branch 'remotes/origin/master' into remote
umputun Jun 18, 2019
2ed7068
error responses of json api with json, time out on remote server close
umputun Jun 18, 2019
000e19a
Merge remote-tracking branch 'remotes/origin/master' into remote
umputun Jun 19, 2019
ab73d82
change remote interface to struct requests
umputun Jun 20, 2019
21cd81e
add remote implementation of admin store
umputun Jun 21, 2019
247e1e2
fix empty (no args) remote calls
umputun Jun 21, 2019
e83a4a2
support remote server group handler
umputun Jun 24, 2019
2b7ddcb
adjust remote tests, remove legacy mongo tests
umputun Jun 25, 2019
db59773
add remote selection to store and admin
umputun Jun 25, 2019
41e95f9
fix recreation of bdb in delete
umputun Jun 25, 2019
4810b01
larger limit for remote srv throttler
umputun Jun 25, 2019
8309dd8
clear mongo leftovers
umputun Jun 25, 2019
dc5e27a
clean drone build
umputun Jun 25, 2019
4727e37
lint: test warnings
umputun Jun 26, 2019
be86a72
lint: more test warns
umputun Jun 26, 2019
ea5fbca
add test for app with remote plugins
umputun Jun 26, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adjust remote tests, remove legacy mongo tests
  • Loading branch information
umputun committed Jun 25, 2019
commit 2b7ddcb6e551a8292ff96d61367153e60402d761
22 changes: 6 additions & 16 deletions backend/app/cmd/avatar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,33 +22,23 @@ func TestAvatar_Execute(t *testing.T) {
}
defer os.RemoveAll("/tmp/ava-test")

// from fs to mongo
// from fs to bolt
cmd := AvatarCommand{migrator: &avatarMigratorMock{retCount: 100}}
cmd.SetCommon(CommonOpts{RemarkURL: "", SharedSecret: "123456"})
p := flags.NewParser(&cmd, flags.Default)
_, err := p.ParseArgs([]string{"--src.type=fs", "--src.fs.path=/tmp/ava-test", "--dst.type=mongo",
"--mongo.url=" + mongoURL, "--mongo.db=test_remark"})
require.Nil(t, err)
err = cmd.Execute(nil)
assert.NoError(t, err)

// from fs to bolt
cmd = AvatarCommand{migrator: &avatarMigratorMock{retCount: 100}}
cmd.SetCommon(CommonOpts{RemarkURL: "", SharedSecret: "123456"})
p = flags.NewParser(&cmd, flags.Default)
_, err = p.ParseArgs([]string{"--src.type=fs", "--src.fs.path=/tmp/ava-test", "--dst.type=bolt",
_, err := p.ParseArgs([]string{"--src.type=fs", "--src.fs.path=/tmp/ava-test", "--dst.type=bolt",
"--dst.bolt.file=/tmp/ava-test.db"})
require.Nil(t, err)
require.NoError(t, err)
err = cmd.Execute(nil)
assert.NoError(t, err)

// failed
cmd = AvatarCommand{migrator: &avatarMigratorMock{retCount: 0, retError: errors.New("failed blah")}}
cmd.SetCommon(CommonOpts{RemarkURL: "", SharedSecret: "123456"})
p = flags.NewParser(&cmd, flags.Default)
_, err = p.ParseArgs([]string{"--src.type=fs", "--src.fs.path=/tmp/ava-test", "--dst.type=mongo",
"--mongo.url=" + mongoURL, "--mongo.db=test_remark"})
require.Nil(t, err)
_, err = p.ParseArgs([]string{"--src.type=fs", "--src.fs.path=/tmp/ava-test", "--dst.type=bolt",
"--dst.bolt.file=/tmp/ava-test.db"})
require.NoError(t, err)
err = cmd.Execute(nil)
assert.Error(t, err, "failed blah")
}
Expand Down
2 changes: 1 addition & 1 deletion backend/app/store/admin/remote_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
)

func TestRemote_Key(t *testing.T) {
ts := testServer(t, `{"method":"admin.key","params":null,"id":1}`,
ts := testServer(t, `{"method":"admin.key","id":1}`,
`{"result":"12345","id":1}`)
defer ts.Close()
c := Remote{Client: remote.Client{API: ts.URL, Client: http.Client{}}}
Expand Down
4 changes: 2 additions & 2 deletions backend/app/store/engine/remote_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func TestRemote_FailedStatus(t *testing.T) {

req := GetRequest{Locator: store.Locator{URL: "http://example.com/url"}, CommentID: "site"}
_, err := c.Get(req)
assert.EqualError(t, err, "bad status 400 for store.get")
assert.EqualError(t, err, "bad status 400 Bad Request for store.get")
}

func TestRemote_Update(t *testing.T) {
Expand Down Expand Up @@ -160,7 +160,7 @@ func TestRemote_Delete(t *testing.T) {
}

func TestRemote_Close(t *testing.T) {
ts := testServer(t, `{"method":"store.close","params":null,"id":1}`, `{}`)
ts := testServer(t, `{"method":"store.close","id":1}`, `{}`)
defer ts.Close()
c := Remote{Client: remote.Client{API: ts.URL, Client: http.Client{}}}
err := c.Close()
Expand Down