From 0f2a872e1c6bc16166f102312835217f20648116 Mon Sep 17 00:00:00 2001
From: DmitryFrolovTri <23313323+DmitryFrolovTri@users.noreply.github.com>
Date: Wed, 28 Jan 2026 13:25:54 +0000
Subject: [PATCH] tests/integration/git_general_test.go revert to upstream/main
 and tests/integration/size_limit_test.go update

---
 tests/integration/git_general_test.go | 75 +++++++++++++--------------
 tests/integration/size_limit_test.go  | 10 +++-
 2 files changed, 44 insertions(+), 41 deletions(-)

diff --git a/tests/integration/git_general_test.go b/tests/integration/git_general_test.go
index 014ad6d0eb..f789ae3747 100644
--- a/tests/integration/git_general_test.go
+++ b/tests/integration/git_general_test.go
@@ -97,8 +97,6 @@ func testGitGeneral(t *testing.T, u *url.URL) {
 			mediaTest(t, &forkedUserCtx, pushedFilesStandard[0], pushedFilesStandard[1], pushedFilesLFS[0], pushedFilesLFS[1])
 		})
 
-		u.Path = httpContext.GitPath()
-		u.User = url.UserPassword(username, userPassword)
 		t.Run("PushCreate", doPushCreate(httpContext, u))
 	})
 	t.Run("SSH", func(t *testing.T) {
@@ -185,40 +183,45 @@ func ensureAnonymousClone(t *testing.T, u *url.URL) {
 }
 
 func standardCommitAndPushTest(t *testing.T, dstPath string, sizes ...int) (pushedFiles []string) {
-	defer tests.PrintCurrentTest(t)()
-	return commitAndPushTest(t, dstPath, "data-file-", sizes...)
+	t.Run("CommitAndPushStandard", func(t *testing.T) {
+		defer tests.PrintCurrentTest(t)()
+		pushedFiles = commitAndPushTest(t, dstPath, "data-file-", sizes...)
+	})
+	return pushedFiles
 }
 
 func lfsCommitAndPushTest(t *testing.T, dstPath string, sizes ...int) (pushedFiles []string) {
-	defer tests.PrintCurrentTest(t)()
-	prefix := "lfs-data-file-"
-	err := gitcmd.NewCommand("lfs").AddArguments("install").WithDir(dstPath).Run(t.Context())
-	assert.NoError(t, err)
-	_, _, err = gitcmd.NewCommand("lfs").AddArguments("track").AddDynamicArguments(prefix + "*").
-		WithDir(dstPath).RunStdString(t.Context())
-	assert.NoError(t, err)
-	err = git.AddChanges(t.Context(), dstPath, false, ".gitattributes")
-	assert.NoError(t, err)
-
-	err = git.CommitChanges(t.Context(), dstPath, git.CommitChangesOptions{
-		Committer: &git.Signature{
-			Email: "user2@example.com",
-			Name:  "User Two",
-			When:  time.Now(),
-		},
-		Author: &git.Signature{
-			Email: "user2@example.com",
-			Name:  "User Two",
-			When:  time.Now(),
-		},
-		Message: "Add LFS Tracking",
-	})
-	assert.NoError(t, err)
-
-	pushedFiles = commitAndPushTest(t, dstPath, prefix, sizes...)
-	t.Run("Locks", func(t *testing.T) {
+	t.Run("CommitAndPushLFS", func(t *testing.T) {
 		defer tests.PrintCurrentTest(t)()
-		lockTest(t, dstPath)
+		prefix := "lfs-data-file-"
+		err := gitcmd.NewCommand("lfs").AddArguments("install").WithDir(dstPath).Run(t.Context())
+		assert.NoError(t, err)
+		_, _, err = gitcmd.NewCommand("lfs").AddArguments("track").AddDynamicArguments(prefix + "*").
+			WithDir(dstPath).RunStdString(t.Context())
+		assert.NoError(t, err)
+		err = git.AddChanges(t.Context(), dstPath, false, ".gitattributes")
+		assert.NoError(t, err)
+
+		err = git.CommitChanges(t.Context(), dstPath, git.CommitChangesOptions{
+			Committer: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "User Two",
+				When:  time.Now(),
+			},
+			Author: &git.Signature{
+				Email: "user2@example.com",
+				Name:  "User Two",
+				When:  time.Now(),
+			},
+			Message: fmt.Sprintf("Testing commit @ %v", time.Now()),
+		})
+		assert.NoError(t, err)
+
+		pushedFiles = commitAndPushTest(t, dstPath, prefix, sizes...)
+		t.Run("Locks", func(t *testing.T) {
+			defer tests.PrintCurrentTest(t)()
+			lockTest(t, dstPath)
+		})
 	})
 	return pushedFiles
 }
@@ -328,14 +331,6 @@ func doCommitAndPush(t *testing.T, size int, repoPath, prefix string) string {
 	return name
 }
 
-func doCommitAndPushWithExpectedError(t *testing.T, size int, repoPath, prefix string) string {
-	name, err := generateCommitWithNewData(t.Context(), size, repoPath, "user2@example.com", "User Two", prefix)
-	assert.NoError(t, err)
-	_, _, err = gitcmd.NewCommand("push", "origin", "master").WithDir(repoPath).RunStdString(t.Context()) // Push
-	assert.Error(t, err)
-	return name
-}
-
 func generateCommitWithNewData(ctx context.Context, size int, repoPath, email, fullName, prefix string) (string, error) {
 	tmpFile, err := os.CreateTemp(repoPath, prefix)
 	if err != nil {
diff --git a/tests/integration/size_limit_test.go b/tests/integration/size_limit_test.go
index 30adbd65d5..ef6d3907df 100644
--- a/tests/integration/size_limit_test.go
+++ b/tests/integration/size_limit_test.go
@@ -338,4 +338,12 @@ func doCommitAndPushLFSWithRandomDataWithExpectedError(t *testing.T, repoPath, f
 	assert.Error(t, err)
 }
 
-// Reuse global helpers for Git: doCommitAndPush, doCommitAndPushWithExpectedError
+// Reuse global helpers for Git: doCommitAndPush
+
+func doCommitAndPushWithExpectedError(t *testing.T, size int, repoPath, prefix string) string {
+	name, err := generateCommitWithNewData(t.Context(), size, repoPath, "user2@example.com", "User Two", prefix)
+	assert.NoError(t, err)
+	_, _, err = gitcmd.NewCommand("push", "origin", "master").WithDir(repoPath).RunStdString(t.Context()) // Push
+	assert.Error(t, err)
+	return name
+}