feat: rm temp data

hunjixin · hunjixin · commit 4c15e6a01f29 · 2024-01-09T17:23:02.000+08:00
diff --git a/integrationtest/helper_test.go b/integrationtest/helper_test.go
@@ -57,7 +57,7 @@ func TestDoubleInit(t *testing.T) { //nolint
 type Closer func()
 
 func SetupDaemon(t *testing.T, ctx context.Context) (string, Closer) { //nolint
-	pg, connectString, _ := testhelper.SetupDatabase(ctx, t)
+	closeDB, connectString, _ := testhelper.SetupDatabase(ctx, t)
 
 	port, err := freeport.GetFreePort()
 	require.NoError(t, err)
@@ -70,7 +70,8 @@ func SetupDaemon(t *testing.T, ctx context.Context) (string, Closer) { //nolint
 
 	closer := func() {
 		cancel()
-		require.NoError(t, pg.Stop())
+		require.NoError(t, os.RemoveAll(tmpDir))
+		closeDB()
 	}
 	go func() {
 		err := Daemon(ctx, buf, tmpDir, url)
diff --git a/integrationtest/merge_request_test.go b/integrationtest/merge_request_test.go
@@ -337,15 +337,14 @@ func MergeRequestSpec(ctx context.Context, urlStr string) func(c convey.C) {
 					result, err := api.ParseListMergeRequestsResponse(resp)
 					convey.So(err, convey.ShouldBeNil)
 					convey.ShouldHaveLength(*result.JSON200, 2)
-					if i > 5 {
+					if i >= 5 {
 						convey.ShouldBeFalse((*result.JSON200).Pagination.HasMore)
 					} else {
 						convey.ShouldBeTrue((*result.JSON200).Pagination.HasMore)
+						next, err := time.Parse(`2006-01-02 15:04:05.999999999 -0700 MST`, (*result.JSON200).Pagination.NextOffset)
+						convey.So(err, convey.ShouldBeNil)
+						after = &next
 					}
-					fmt.Println((*result.JSON200).Pagination.NextOffset)
-					next, err := time.Parse(`2006-01-02 15:04:05.000000 +0800 CST`, (*result.JSON200).Pagination.NextOffset)
-					convey.So(err, convey.ShouldBeNil)
-					after = &next
 				}
 			})
 		})
diff --git a/models/branch_test.go b/models/branch_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestRefRepoInsert(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewBranchRepo(db)
 
diff --git a/models/commit_test.go b/models/commit_test.go
@@ -14,8 +14,8 @@ import (
 
 func TestCommitRepo(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	commitRepo := models.NewCommitRepo(db, repoID)
@@ -41,8 +41,8 @@ func TestCommitRepo(t *testing.T) {
 
 func TestDeleteCommit(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 	t.Run("delete commit", func(t *testing.T) {
 		repoID := uuid.New()
 		commitRepo := models.NewCommitRepo(db, repoID)
diff --git a/models/merge_request_test.go b/models/merge_request_test.go
@@ -17,8 +17,8 @@ import (
 
 func TestMergeRequestRepoInsert(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	mrRepo := models.NewMergeRequestRepo(db)
 
diff --git a/models/repo_test.go b/models/repo_test.go
@@ -16,8 +16,8 @@ import (
 
 func TestRepoTransaction(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	t.Run("simple", func(t *testing.T) {
 		pgRepo := models.NewRepo(db)
diff --git a/models/repository_test.go b/models/repository_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestRepositoryUpdate(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepositoryRepo(db)
 
@@ -49,8 +49,8 @@ func TestRepositoryUpdate(t *testing.T) {
 
 func TestRepositoryRepoInsert(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepositoryRepo(db)
 
diff --git a/models/tag_test.go b/models/tag_test.go
@@ -14,8 +14,8 @@ import (
 
 func TestTagRepo(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	tagRepo := models.NewTagRepo(db, repoID)
@@ -41,8 +41,8 @@ func TestTagRepo(t *testing.T) {
 
 func TestDeleteTag(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 	t.Run("delete tag", func(t *testing.T) {
 		repoID := uuid.New()
 		tagRepo := models.NewTagRepo(db, repoID)
diff --git a/models/tree_test.go b/models/tree_test.go
@@ -39,8 +39,8 @@ func Test_sortSubObjects(t *testing.T) {
 
 func TestObjectRepo_Insert(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewFileTree(db, repoID)
@@ -99,8 +99,8 @@ func TestNewTreeNode(t *testing.T) {
 
 func TestFileTreeRepo_Delete(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewFileTree(db, repoID)
diff --git a/models/user_test.go b/models/user_test.go
@@ -19,8 +19,8 @@ var dbTimeCmpOpt = cmp.Comparer(func(x, y time.Time) bool {
 
 func TestNewUserRepo(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewUserRepo(db)
 
diff --git a/models/wip_test.go b/models/wip_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestWipRepo(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewWipRepo(db)
 
@@ -72,8 +72,8 @@ func TestWipRepo(t *testing.T) {
 
 func TestWipRepoUpdateByID(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewWipRepo(db)
 
diff --git a/testhelper/pg.go b/testhelper/pg.go
@@ -18,7 +18,9 @@ import (
 
 var TestConnTmpl = "postgres://postgres:postgres@localhost:%d/jiaozifs?sslmode=disable"
 
-func SetupDatabase(ctx context.Context, t *testing.T) (*embeddedpostgres.EmbeddedPostgres, string, *bun.DB) {
+type CloseFunc func()
+
+func SetupDatabase(ctx context.Context, t *testing.T) (CloseFunc, string, *bun.DB) {
 	port, err := freeport.GetFreePort()
 	require.NoError(t, err)
 	tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
@@ -39,5 +41,8 @@ func SetupDatabase(ctx context.Context, t *testing.T) (*embeddedpostgres.Embedde
 
 	err = migrations.MigrateDatabase(ctx, db)
 	require.NoError(t, err)
-	return postgres, connStr, db
+	return func() {
+		require.NoError(t, postgres.Stop())
+		require.NoError(t, os.RemoveAll(tmpDir))
+	}, connStr, db
 }
diff --git a/versionmgr/commit_node_test.go b/versionmgr/commit_node_test.go
@@ -22,8 +22,8 @@ import (
 //		C---->D
 func TestWrapCommitNode(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
diff --git a/versionmgr/commit_walker_bfs_filtered_test.go b/versionmgr/commit_walker_bfs_filtered_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestNewFilterCommitIter(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
diff --git a/versionmgr/commit_walker_bfs_test.go b/versionmgr/commit_walker_bfs_test.go
@@ -22,8 +22,8 @@ import (
 //		C---->D
 func TestBfsCommitIterator(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
diff --git a/versionmgr/commit_walker_ctime_test.go b/versionmgr/commit_walker_ctime_test.go
@@ -25,8 +25,8 @@ import (
 // use time.sleep to control the order, expect f-e-d-b-c-a-root
 func TestNewCommitIterCTime(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
diff --git a/versionmgr/commit_walker_test.go b/versionmgr/commit_walker_test.go
@@ -22,8 +22,8 @@ import (
 //		C---->D
 func TestNewCommitPostorderIter(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
@@ -125,8 +125,8 @@ func TestNewCommitPostorderIter(t *testing.T) {
 //		C---->D
 func TestCommitPreorderIter(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	repo := models.NewRepo(db)
diff --git a/versionmgr/merge_base_test.go b/versionmgr/merge_base_test.go
@@ -15,8 +15,8 @@ import (
 
 func TestCommitNodeMergeBase(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repoID := uuid.New()
 	commitRepo := models.NewCommitRepo(db, repoID)
diff --git a/versionmgr/work_repo_diff_test.go b/versionmgr/work_repo_diff_test.go
@@ -14,8 +14,8 @@ import (
 
 func TestWorkRepositoryDiffCommit(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepo(db)
 	adapter := mem.New(ctx)
diff --git a/versionmgr/work_repo_merge_test.go b/versionmgr/work_repo_merge_test.go
@@ -25,8 +25,8 @@ import (
 
 func TestCommitOpMerge(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	adapter := mem.New(ctx)
 	repo := models.NewRepo(db)
@@ -154,8 +154,8 @@ func TestCommitOpMerge(t *testing.T) {
 //		     B-------G
 func TestCrissCrossMerge(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepo(db)
 	adapter := mem.New(ctx)
diff --git a/versionmgr/work_repo_test.go b/versionmgr/work_repo_test.go
@@ -27,8 +27,8 @@ import (
 
 func TestTreeWriteBlob(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	adapter := mem.New(ctx)
 	repo := models.NewRepo(db)
@@ -68,8 +68,8 @@ func TestNewWorkRepositoryFromConfig(t *testing.T) {
 	tmpDir, err := os.MkdirTemp(os.TempDir(), "*")
 	require.NoError(t, err)
 
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepo(db)
 	user, err := makeUser(ctx, repo.UserRepo(), "admin")
@@ -174,8 +174,8 @@ func TestNewWorkRepositoryFromConfig(t *testing.T) {
 func TestWorkRepositoryRootTree(t *testing.T) {
 	ctx := context.Background()
 
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepo(db)
 	user, err := makeUser(ctx, repo.UserRepo(), "admin")
@@ -210,8 +210,8 @@ func TestWorkRepositoryRootTree(t *testing.T) {
 
 func TestWorkRepositoryRevert(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 
 	repo := models.NewRepo(db)
 	adapter := mem.New(ctx)
@@ -355,8 +355,8 @@ func TestWorkRepositoryRevert(t *testing.T) {
 
 func TestWorkRepositoryMergeState(t *testing.T) {
 	ctx := context.Background()
-	postgres, _, db := testhelper.SetupDatabase(ctx, t)
-	defer postgres.Stop() //nolint
+	closeDB, _, db := testhelper.SetupDatabase(ctx, t)
+	defer closeDB()
 	repo := models.NewRepo(db)
 
 	user, err := makeUser(ctx, repo.UserRepo(), "admin")
diff --git a/versionmgr/worktree_test.go b/versionmgr/worktree_test.go
