diff --git a/backend/app/rest/api/migrator_test.go b/backend/app/rest/api/migrator_test.go index b298e295ec..196f764afd 100644 --- a/backend/app/rest/api/migrator_test.go +++ b/backend/app/rest/api/migrator_test.go @@ -168,11 +168,12 @@ func TestMigrator_ImportWaitExpired(t *testing.T) { "picture":"/api/v1/avatar/remark.image","profile":"https://remark42.com","admin":true, "ip":"ae12fe3b5f129b5cc4cdd2b136b7b7947c4d2741"},"locator":{"site":"remark42","url":"https://radio-t.com/blah1"},"score":0, "votes":{},"time":"2018-04-30T01:37:00.849053725-05:00"}` - recs := []string{} - for i := 0; i < 50; i++ { + nRecs := 50 + recs := make([]string, 0, nRecs) + for i := 0; i < nRecs; i++ { recs = append(recs, fmt.Sprintf(tmpl, i)) } - r := strings.NewReader(`{"version":1}` + strings.Join(recs, "\n")) // reader with 10k records + r := strings.NewReader(`{"version":1}` + strings.Join(recs, "\n")) // reader with `nRecs` records client := &http.Client{Timeout: 5 * time.Second} req, err := http.NewRequest("POST", ts.URL+"/api/v1/admin/import?site=remark42&provider=native", r) require.NoError(t, err) @@ -183,7 +184,7 @@ func TestMigrator_ImportWaitExpired(t *testing.T) { assert.Equal(t, http.StatusAccepted, resp.StatusCode) client = &http.Client{Timeout: 5 * time.Second} - req, err = http.NewRequest("GET", ts.URL+"/api/v1/admin/wait?site=remark42&timeout=10ms", nil) + req, err = http.NewRequest("GET", ts.URL+"/api/v1/admin/wait?site=remark42&timeout=5ms", nil) require.NoError(t, err) req.SetBasicAuth("admin", "password") assert.NoError(t, err) diff --git a/backend/app/store/image/fs_store_test.go b/backend/app/store/image/fs_store_test.go index 5af64a9bd5..39f9dcdcc6 100644 --- a/backend/app/store/image/fs_store_test.go +++ b/backend/app/store/image/fs_store_test.go @@ -70,7 +70,7 @@ func TestFsStore_SaveWithResize(t *testing.T) { t.Log(img) data, err := ioutil.ReadFile(img) assert.NoError(t, err) - assert.Equal(t, 1142, len(data)) + assert.Equal(t, 1135, len(data)) } func TestFsStore_SaveWithResizeJpeg(t *testing.T) { @@ -91,7 +91,7 @@ func TestFsStore_SaveWithResizeJpeg(t *testing.T) { t.Log(img) data, err := ioutil.ReadFile(img) assert.NoError(t, err) - assert.Equal(t, 10786, len(data)) + assert.Equal(t, 10918, len(data)) } func TestFsStore_SaveNoResizeJpeg(t *testing.T) { diff --git a/backend/app/store/image/image.go b/backend/app/store/image/image.go index 94a2e62950..1d86a12494 100644 --- a/backend/app/store/image/image.go +++ b/backend/app/store/image/image.go @@ -161,7 +161,7 @@ func resize(data []byte, limitW, limitH int) []byte { newW, newH := getProportionalSizes(w, h, limitW, limitH) m := image.NewRGBA(image.Rect(0, 0, newW, newH)) - draw.BiLinear.Scale(m, m.Bounds(), src, src.Bounds(), draw.Src, nil) + draw.CatmullRom.Scale(m, m.Bounds(), src, src.Bounds(), draw.Src, nil) var out bytes.Buffer if err = png.Encode(&out, m); err != nil {