Skip to content

Refactoring before implementing search (see #757) #765

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.

Sign up for GitHub

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

Merged
umputun merged 2 commits into from
Aug 26, 2020
Merged

Refactoring before implementing search (see #757) #765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60192eb
Add function randomPath to rest_test.go
vdimir Aug 25, 2020
99fa3df
Add function createAppFromCmd to server_test.go
vdimir Aug 25, 2020
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
5 changes: 4 additions & 1 deletion backend/app/cmd/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,7 +642,10 @@ func prepServerApp(t *testing.T, fn func(o ServerCommand) ServerCommand) (*serve

os.Remove(cmd.Store.Bolt.Path + "/remark.db")

// create app
return createAppFromCmd(t, cmd)
}

func createAppFromCmd(t *testing.T, cmd ServerCommand) (*serverApp, context.Context, context.CancelFunc) {
app, err := cmd.newServerApp()
require.NoError(t, err)

Expand Down
21 changes: 14 additions & 7 deletions backend/app/rest/api/rest_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,17 +333,24 @@ func TestRest_cacheControl(t *testing.T) {

}

func startupT(t *testing.T) (ts *httptest.Server, srv *Rest, teardown func()) {
tmp := os.TempDir()
var testDB string
// pick a file name which is not in use for sure
// randomPath pick a file or folder name which is not in use for sure
func randomPath(tempDir, basename, suffix string) (string, error) {
for i := 0; i < 10; i++ {
testDB = fmt.Sprintf("/%s/test-remark-%d.db", tmp, rand.Int31())
_, err := os.Stat(testDB)
fname := fmt.Sprintf("/%s/%s-%d%s", tempDir, basename, rand.Int31(), suffix)
fmt.Printf("fname %q", fname)
_, err := os.Stat(fname)
if err != nil {
break
return fname, nil
}
}
return "", errors.New("cannot create temp file")
}

func startupT(t *testing.T) (ts *httptest.Server, srv *Rest, teardown func()) {
tmp := os.TempDir()
testDB, err := randomPath(tmp, "test-remark", ".db")
require.NoError(t, err)

_ = os.RemoveAll(tmp + "/ava-remark42")
_ = os.RemoveAll(tmp + "/pics-remark42")

Expand Down