From bad9ae0f58eead1769bcd97ed2af196bed6c3885 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Mon, 27 Oct 2025 19:13:24 -0700 Subject: [PATCH] Fix test --- tests/integration/api_branch_test.go | 2 +- tests/integration/pull_merge_test.go | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/integration/api_branch_test.go b/tests/integration/api_branch_test.go index 2147ef9d0d..d50834514b 100644 --- a/tests/integration/api_branch_test.go +++ b/tests/integration/api_branch_test.go @@ -320,7 +320,7 @@ func TestAPICreateBranchWithSyncBranches(t *testing.T) { RepoID: 1, }) assert.NoError(t, err) - assert.Len(t, branches, 9) + assert.Len(t, branches, 10) branches, err = db.Find[git_model.Branch](t.Context(), git_model.FindBranchOptions{ RepoID: 1, diff --git a/tests/integration/pull_merge_test.go b/tests/integration/pull_merge_test.go index d7c33d97f8..1830f1bda4 100644 --- a/tests/integration/pull_merge_test.go +++ b/tests/integration/pull_merge_test.go @@ -409,12 +409,6 @@ func TestCantMergeUnrelated(t *testing.T) { assert.NoError(t, err) defer gitRepo1.Close() - _, _, err = gitcmd.NewCommand("branch", "unrelated"). - AddDynamicArguments(commitSha). - WithDir(path). - RunStdString(t.Context()) - assert.NoError(t, err) - assert.NoError(t, repo_service.CreateNewBranchFromCommit(t.Context(), user1, repo1, gitRepo1, commitSha, "unrelated")) testEditFileToNewBranch(t, session, "user1", "repo1", "master", "conflict", "README.md", "Hello, World (Edited Once)\n")