Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-05-17 08:03:03 +02:00
Code Issues Activity

fixing the git_gneral_tests.go for new gitea version

Browse Source
This commit is contained in:
DmitryFrolovTri 2025-12-09 13:05:13 +00:00
parent 554c303746
commit f4dff6a1dc
No known key found for this signature in database
GPG Key ID: 0FBA4D49377CDDC3
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/integration/git_general_test.go
View File

@ -91,25 +91,25 @@ func testGitGeneral(t *testing.T, u *url.URL) {
setting.SaveGlobalRepositorySetting(true, 0) setting.SaveGlobalRepositorySetting(true, 0)
t.Run("Under", func(t *testing.T) { t.Run("Under", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
doCommitAndPush(t, littleSize, dstPath, "data-file-") doCommitAndPush(t, testFileSizeSmall, dstPath, "data-file-")
}) })
t.Run("Over", func(t *testing.T) { t.Run("Over", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
u.Path = forkedUserCtx.GitPath() u.Path = forkedUserCtx.GitPath()
u.User = url.UserPassword(forkedUserCtx.Username, userPassword) u.User = url.UserPassword(forkedUserCtx.Username, userPassword)
t.Run("Clone", doGitClone(dstForkedPath, u)) t.Run("Clone", doGitClone(dstForkedPath, u))
t.Run("APISetRepoSizeLimit", doAPISetRepoSizeLimit(forkedUserCtx, forkedUserCtx.Username, forkedUserCtx.Reponame, littleSize)) t.Run("APISetRepoSizeLimit", doAPISetRepoSizeLimit(forkedUserCtx, forkedUserCtx.Username, forkedUserCtx.Reponame, testFileSizeSmall))
doCommitAndPushWithExpectedError(t, bigSize, dstForkedPath, "data-file-") doCommitAndPushWithExpectedError(t, testFileSizeLarge, dstForkedPath, "data-file-")
}) })
t.Run("UnderAfterResize", func(t *testing.T) { t.Run("UnderAfterResize", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
t.Run("APISetRepoSizeLimit", doAPISetRepoSizeLimit(forkedUserCtx, forkedUserCtx.Username, forkedUserCtx.Reponame, bigSize*10)) t.Run("APISetRepoSizeLimit", doAPISetRepoSizeLimit(forkedUserCtx, forkedUserCtx.Username, forkedUserCtx.Reponame, testFileSizeLarge*10))
doCommitAndPush(t, littleSize, dstPath, "data-file-") doCommitAndPush(t, testFileSizeSmall, dstPath, "data-file-")
}) })
t.Run("Deletion", func(t *testing.T) { t.Run("Deletion", func(t *testing.T) {
defer tests.PrintCurrentTest(t)() defer tests.PrintCurrentTest(t)()
doCommitAndPush(t, littleSize, dstPath, "data-file-") doCommitAndPush(t, testFileSizeSmall, dstPath, "data-file-")
bigFileName := doCommitAndPush(t, bigSize, dstPath, "data-file-") bigFileName := doCommitAndPush(t, testFileSizeLarge, dstPath, "data-file-")
oldRepoSize := doGetRemoteRepoSizeViaAPI(t, forkedUserCtx) oldRepoSize := doGetRemoteRepoSizeViaAPI(t, forkedUserCtx)
lastCommitID := doGetAddCommitID(t, dstPath, bigFileName) lastCommitID := doGetAddCommitID(t, dstPath, bigFileName)
doDeleteAndPush(t, dstPath, bigFileName) doDeleteAndPush(t, dstPath, bigFileName)
@ -119,7 +119,7 @@ func testGitGeneral(t *testing.T, u *url.URL) {
setting.SaveGlobalRepositorySetting(false, 0) setting.SaveGlobalRepositorySetting(false, 0)
}) })
}) })
t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "master", "test/head")) t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "test/head"))
t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "test/head")) t.Run("CreateAgitFlowPull", doCreateAgitFlowPull(dstPath, &httpContext, "test/head"))
t.Run("CreateProtectedBranch", doCreateProtectedBranch(&httpContext, dstPath)) t.Run("CreateProtectedBranch", doCreateProtectedBranch(&httpContext, dstPath))
t.Run("BranchProtectMerge", doBranchProtectPRMerge(&httpContext, dstPath)) t.Run("BranchProtectMerge", doBranchProtectPRMerge(&httpContext, dstPath))
@ -365,29 +365,29 @@ func doGetRemoteRepoSizeViaAPI(t *testing.T, ctx APITestContext) int64 {
} }
func doDeleteAndPush(t *testing.T, repoPath, filename string) { func doDeleteAndPush(t *testing.T, repoPath, filename string) {
_, _, err := git.NewCommand(git.DefaultContext, "rm").AddDashesAndList(filename).RunStdString(&git.RunOpts{Dir: repoPath}) // Delete _, _, err := gitcmd.NewCommand("rm").AddDashesAndList(filename).WithDir(repoPath).RunStdString(t.Context()) // Delete
assert.NoError(t, err) assert.NoError(t, err)
signature := git.Signature{ signature := git.Signature{
Email: "user2@example.com", Email: "user2@example.com",
Name: "User Two", Name: "User Two",
When: time.Now(), When: time.Now(),
} }
_, _, err = git.NewCommand(git.DefaultContext, "status").RunStdString(&git.RunOpts{Dir: repoPath}) _, _, err = gitcmd.NewCommand("status").WithDir(repoPath).RunStdString(t.Context())
assert.NoError(t, err) assert.NoError(t, err)
err2 := git.CommitChanges(repoPath, git.CommitChangesOptions{ // Commit err2 := git.CommitChanges(t.Context(), repoPath, git.CommitChangesOptions{ // Commit
Committer: &signature, Committer: &signature,
Author: &signature, Author: &signature,
Message: "Delete Commit", Message: "Delete Commit",
}) })
assert.NoError(t, err2) assert.NoError(t, err2)
_, _, err = git.NewCommand(git.DefaultContext, "status").RunStdString(&git.RunOpts{Dir: repoPath}) _, _, err = gitcmd.NewCommand("status").WithDir(repoPath).RunStdString(t.Context())
assert.NoError(t, err) assert.NoError(t, err)
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push _, _, err = gitcmd.NewCommand("push", "origin", "master").WithDir(repoPath).RunStdString(t.Context()) // Push
assert.NoError(t, err) assert.NoError(t, err)
} }
func doGetAddCommitID(t *testing.T, repoPath, filename string) string { func doGetAddCommitID(t *testing.T, repoPath, filename string) string {
output, _, err := git.NewCommand(git.DefaultContext, "log", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push output, _, err := gitcmd.NewCommand("log", "origin", "master").WithDir(repoPath).RunStdString(t.Context()) // Push
assert.NoError(t, err) assert.NoError(t, err)
list := strings.Fields(output) list := strings.Fields(output)
assert.LessOrEqual(t, 2, len(list)) assert.LessOrEqual(t, 2, len(list))
@ -395,12 +395,12 @@ func doGetAddCommitID(t *testing.T, repoPath, filename string) string {
} }
func doRebaseCommitAndPush(t *testing.T, repoPath, commitID string) { func doRebaseCommitAndPush(t *testing.T, repoPath, commitID string) {
command := git.NewCommand(git.DefaultContext, "rebase", "--interactive").AddDashesAndList(commitID) command := gitcmd.NewCommand("rebase", "--interactive").AddDashesAndList(commitID)
env := os.Environ() env := os.Environ()
env = append(env, "GIT_SEQUENCE_EDITOR=true") env = append(env, "GIT_SEQUENCE_EDITOR=true")
_, _, err := command.RunStdString(&git.RunOpts{Dir: repoPath, Env: env}) // Push _, _, err := command.WithDir(repoPath).WithEnv(env).RunStdString(t.Context()) // Push
assert.NoError(t, err) assert.NoError(t, err)
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "master", "-f").RunStdString(&git.RunOpts{Dir: repoPath}) // Push _, _, err = gitcmd.NewCommand("push", "origin", "master", "-f").WithDir(repoPath).RunStdString(t.Context()) // Push
assert.NoError(t, err) assert.NoError(t, err)
} }
@ -413,9 +413,9 @@ func doCommitAndPush(t *testing.T, size int, repoPath, prefix string) string {
} }
func doCommitAndPushWithExpectedError(t *testing.T, size int, repoPath, prefix string) string { func doCommitAndPushWithExpectedError(t *testing.T, size int, repoPath, prefix string) string {
name, err := generateCommitWithNewData(size, repoPath, "user2@example.com", "User Two", prefix) name, err := generateCommitWithNewData(t.Context(), size, repoPath, "user2@example.com", "User Two", prefix)
assert.NoError(t, err) assert.NoError(t, err)
_, _, err = git.NewCommand(git.DefaultContext, "push", "origin", "master").RunStdString(&git.RunOpts{Dir: repoPath}) // Push _, _, err = gitcmd.NewCommand("push", "origin", "master").WithDir(repoPath).RunStdString(t.Context()) // Push
assert.Error(t, err) assert.Error(t, err)
return name return name
} }