sascha
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix test

pull/31899/head
Lunny Xiao 2025-10-27 19:13:24 +07:00
parent 94424b788d
commit bad9ae0f58
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/api_branch_test.go
Unescape Escape View File

@ -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,

6
tests/integration/pull_merge_test.go
Unescape Escape View File

@ -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")