From 24427b81bef348f93675f1f47af6494fa9e15609 Mon Sep 17 00:00:00 2001
From: Agniva De Sarker <agnivade@yahoo.co.in>
Date: Tue, 7 Mar 2023 19:22:29 +0530
Subject: [PATCH] MM-48627: Fix flaky testGetUptoNSizeFileTime (#22348)

* MM-48627: Fix flaky testGetUptoNSizeFileTime

There was an issue with data clean up before
and after the tests.

https://mattermost.atlassian.net/browse/MM-48627

```release-note
NONE
```

* Lint fix and improvements

```release-note
NONE
```
---
 store/localcachelayer/file_info_layer_test.go |  2 +-
 store/sqlstore/file_info_store_test.go        |  2 +-
 store/storetest/file_info_store.go            | 16 +++++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/store/localcachelayer/file_info_layer_test.go b/store/localcachelayer/file_info_layer_test.go
index f2fb6572ca..21f4575289 100644
--- a/store/localcachelayer/file_info_layer_test.go
+++ b/store/localcachelayer/file_info_layer_test.go
@@ -15,7 +15,7 @@ import (
 )
 
 func TestFileInfoStore(t *testing.T) {
-	StoreTest(t, storetest.TestFileInfoStore)
+	StoreTestWithSqlStore(t, storetest.TestFileInfoStore)
 }
 
 func TestFileInfoStoreCache(t *testing.T) {
diff --git a/store/sqlstore/file_info_store_test.go b/store/sqlstore/file_info_store_test.go
index 5b6e46e2aa..35bcdb3c7c 100644
--- a/store/sqlstore/file_info_store_test.go
+++ b/store/sqlstore/file_info_store_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestFileInfoStore(t *testing.T) {
-	StoreTest(t, storetest.TestFileInfoStore)
+	StoreTestWithSqlStore(t, storetest.TestFileInfoStore)
 }
 
 func TestSearchFileInfoStore(t *testing.T) {
diff --git a/store/storetest/file_info_store.go b/store/storetest/file_info_store.go
index 7155f2f538..85518f1bd4 100644
--- a/store/storetest/file_info_store.go
+++ b/store/storetest/file_info_store.go
@@ -17,7 +17,10 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestFileInfoStore(t *testing.T, ss store.Store) {
+func TestFileInfoStore(t *testing.T, ss store.Store, s SqlStore) {
+	t.Cleanup(func() {
+		s.GetMasterX().Exec("TRUNCATE FileInfo")
+	})
 	t.Run("FileInfoSaveGet", func(t *testing.T) { testFileInfoSaveGet(t, ss) })
 	t.Run("FileInfoSaveGetByPath", func(t *testing.T) { testFileInfoSaveGetByPath(t, ss) })
 	t.Run("FileInfoGetForPost", func(t *testing.T) { testFileInfoGetForPost(t, ss) })
@@ -32,7 +35,7 @@ func TestFileInfoStore(t *testing.T, ss store.Store) {
 	t.Run("GetFilesBatchForIndexing", func(t *testing.T) { testFileInfoStoreGetFilesBatchForIndexing(t, ss) })
 	t.Run("CountAll", func(t *testing.T) { testFileInfoStoreCountAll(t, ss) })
 	t.Run("GetStorageUsage", func(t *testing.T) { testFileInfoGetStorageUsage(t, ss) })
-	t.Run("GetUptoNSizeFileTime", func(t *testing.T) { testGetUptoNSizeFileTime(t, ss) })
+	t.Run("GetUptoNSizeFileTime", func(t *testing.T) { testGetUptoNSizeFileTime(t, ss, s) })
 }
 
 func testFileInfoSaveGet(t *testing.T, ss store.Store) {
@@ -809,8 +812,7 @@ func testFileInfoGetStorageUsage(t *testing.T, ss store.Store) {
 	require.Equal(t, int64(30), usage)
 }
 
-func testGetUptoNSizeFileTime(t *testing.T, ss store.Store) {
-	t.Skip("MM-48627")
+func testGetUptoNSizeFileTime(t *testing.T, ss store.Store, s SqlStore) {
 	_, err := ss.FileInfo().GetUptoNSizeFileTime(0)
 	assert.Error(t, err)
 	_, err = ss.FileInfo().GetUptoNSizeFileTime(-1)
@@ -830,6 +832,7 @@ func testGetUptoNSizeFileTime(t *testing.T, ss store.Store) {
 		CreateAt:  now,
 	})
 	require.NoError(t, err)
+	defer ss.FileInfo().PermanentDelete(f1.Id)
 	now = now + diff
 	f2, err := ss.FileInfo().Save(&model.FileInfo{
 		PostId:    model.NewId(),
@@ -839,6 +842,7 @@ func testGetUptoNSizeFileTime(t *testing.T, ss store.Store) {
 		CreateAt:  now,
 	})
 	require.NoError(t, err)
+	defer ss.FileInfo().PermanentDelete(f2.Id)
 	now = now + diff
 	f3, err := ss.FileInfo().Save(&model.FileInfo{
 		PostId:    model.NewId(),
@@ -848,8 +852,9 @@ func testGetUptoNSizeFileTime(t *testing.T, ss store.Store) {
 		CreateAt:  now,
 	})
 	require.NoError(t, err)
+	defer ss.FileInfo().PermanentDelete(f3.Id)
 	now = now + diff
-	_, err = ss.FileInfo().Save(&model.FileInfo{
+	tmp, err := ss.FileInfo().Save(&model.FileInfo{
 		PostId:    model.NewId(),
 		CreatorId: model.NewId(),
 		Size:      10,
@@ -857,6 +862,7 @@ func testGetUptoNSizeFileTime(t *testing.T, ss store.Store) {
 		CreateAt:  now,
 	})
 	require.NoError(t, err)
+	defer ss.FileInfo().PermanentDelete(tmp.Id)
 
 	createAt, err := ss.FileInfo().GetUptoNSizeFileTime(20)
 	require.NoError(t, err)