From c3896934c9059420cd56e45b175770714fe0b5d6 Mon Sep 17 00:00:00 2001 From: Dmitry Verkhoturov Date: Tue, 14 Apr 2020 18:27:54 +0200 Subject: [PATCH] don't use cache in rest tests which don't utilize it --- backend/app/rest/api/rest_public_test.go | 21 +++++++++++++++++++++ backend/app/rest/api/rest_test.go | 4 +--- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/backend/app/rest/api/rest_public_test.go b/backend/app/rest/api/rest_public_test.go index b6894659..1cd980f1 100644 --- a/backend/app/rest/api/rest_public_test.go +++ b/backend/app/rest/api/rest_public_test.go @@ -733,6 +733,13 @@ func TestRest_LastCommentsStream(t *testing.T) { srv.pubRest.streamer.TimeOut = 500 * time.Millisecond srv.pubRest.streamer.MaxActive = 100 + // stream endpoint currently relies on real cache being present + cacheBackend, err := cache.NewExpirableCache() + require.NoError(t, err) + memCache := cache.NewScache(cacheBackend) + srv.privRest.cache = memCache + srv.pubRest.cache = memCache + postComment(t, ts.URL) defer teardown() @@ -788,6 +795,13 @@ func TestRest_LastCommentsStreamCancel(t *testing.T) { srv.pubRest.streamer.TimeOut = 500 * time.Millisecond srv.pubRest.streamer.MaxActive = 100 + // stream endpoint currently relies on real cache being present + cacheBackend, err := cache.NewExpirableCache() + require.NoError(t, err) + memCache := cache.NewScache(cacheBackend) + srv.privRest.cache = memCache + srv.pubRest.cache = memCache + postComment(t, ts.URL) defer teardown() @@ -854,6 +868,13 @@ func TestRest_LastCommentsStreamSince(t *testing.T) { srv.pubRest.streamer.TimeOut = 500 * time.Millisecond srv.pubRest.streamer.MaxActive = 100 + // stream endpoint currently relies on real cache being present + cacheBackend, err := cache.NewExpirableCache() + require.NoError(t, err) + memCache := cache.NewScache(cacheBackend) + srv.privRest.cache = memCache + srv.pubRest.cache = memCache + postComment(t, ts.URL) defer teardown() diff --git a/backend/app/rest/api/rest_test.go b/backend/app/rest/api/rest_test.go index ec892769..4c393816 100644 --- a/backend/app/rest/api/rest_test.go +++ b/backend/app/rest/api/rest_test.go @@ -342,9 +342,7 @@ func startupT(t *testing.T) (ts *httptest.Server, srv *Rest, teardown func()) { b, err := engine.NewBoltDB(bolt.Options{}, engine.BoltSite{FileName: testDb, SiteID: "remark42"}) require.NoError(t, err) - cacheBackend, err := cache.NewExpirableCache() - require.NoError(t, err) - memCache := cache.NewScache(cacheBackend) + memCache := cache.NewScache(cache.NewNopCache()) astore := adminstore.NewStaticStore("123456", []string{"remark42"}, []string{"a1", "a2"}, "admin@remark-42.com") restrictedWordsMatcher := service.NewRestrictedWordsMatcher(service.StaticRestrictedWordsLister{Words: []string{"duck"}})