From 347fe1a0dbc28aca1837c6745284d4a770086d6e Mon Sep 17 00:00:00 2001 From: Umputun Date: Wed, 6 Mar 2019 12:15:44 -0600 Subject: [PATCH] randomize db name for rest test to avoid conflicts in parallel testing --- backend/app/rest/api/migrator_test.go | 2 ++ backend/app/rest/api/rest_test.go | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/app/rest/api/migrator_test.go b/backend/app/rest/api/migrator_test.go index 68b6e57a..e8e6b976 100644 --- a/backend/app/rest/api/migrator_test.go +++ b/backend/app/rest/api/migrator_test.go @@ -6,6 +6,7 @@ import ( "fmt" "io" "io/ioutil" + "math/rand" "mime/multipart" "net/http" "net/http/httptest" @@ -243,6 +244,7 @@ func waitForImportCompletion(t *testing.T, ts *httptest.Server) { } func prepImportSrv(t *testing.T) (ts *httptest.Server, teardown func()) { + testDb := fmt.Sprintf("/tmp/test-remark-import-%d.db", rand.Int31()) b, err := engine.NewBoltDB(bolt.Options{}, engine.BoltSite{FileName: testDb, SiteID: "radio-t"}) require.Nil(t, err) adminStore := adminstore.NewStaticStore("123456", []string{"a1", "a2"}, "admin@remark-42.com") diff --git a/backend/app/rest/api/rest_test.go b/backend/app/rest/api/rest_test.go index bf3c43b6..51ba067f 100644 --- a/backend/app/rest/api/rest_test.go +++ b/backend/app/rest/api/rest_test.go @@ -4,7 +4,9 @@ import ( "bytes" "crypto/tls" "encoding/json" + "fmt" "io/ioutil" + "math/rand" "net/http" "net/http/httptest" "os" @@ -29,7 +31,6 @@ import ( "github.com/umputun/remark/backend/app/store/service" ) -var testDb = "/tmp/test-remark.db" var testHTML = "/tmp/test-remark.html" var getStartedHTML = "/tmp/getstarted.html" @@ -177,6 +178,7 @@ func TestRest_RunAutocertModeHTTPOnly(t *testing.T) { func startupT(t *testing.T) (ts *httptest.Server, srv *Rest, teardown func()) { + testDb := fmt.Sprintf("/tmp/test-remark-%d.db", rand.Int31()) os.Remove(testDb) os.Remove(testHTML) os.RemoveAll("/tmp/ava-remark42")