Bendigo?alejandro-test

2 files changed, 3 insertions, 16 deletions

diff --git a/internal/service/smarthttp/receive_pack_test.go b/internal/service/smarthttp/receive_pack_test.go
index 6aeb6ae12..1db345112 100644
--- a/internal/service/smarthttp/receive_pack_test.go
+++ b/internal/service/smarthttp/receive_pack_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 
 	pb "gitlab.com/gitlab-org/gitaly-proto/go"
@@ -76,11 +75,6 @@ func TestSuccessfulReceivePackRequestWithGitOpts(t *testing.T) {
 }
 
 func TestFailedReceivePackRequestWithGitOpts(t *testing.T) {
-	currentGitVersion, _ := git.Version()
-	if currentGitVersion == "2.9.0" {
-		t.Skip("Skip because Git 2.9 does not support receive.MaxInputSize")
-	}
-
 	server, serverSocketPath := runSmartHTTPServer(t)
 	defer server.Stop()
 
diff --git a/internal/service/ssh/receive_pack_test.go b/internal/service/ssh/receive_pack_test.go
index c3e1d24ee..513a85152 100644
--- a/internal/service/ssh/receive_pack_test.go
+++ b/internal/service/ssh/receive_pack_test.go
@@ -14,7 +14,6 @@ import (
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/stretchr/testify/require"
 
-	"gitlab.com/gitlab-org/gitaly/internal/git"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 
 	pb "gitlab.com/gitlab-org/gitaly-proto/go"
@@ -112,15 +111,9 @@ func TestReceivePackPushFailure(t *testing.T) {
 		t.Errorf("local and remote head equal. push did not fail")
 	}
 
-	currentGitVersion, _ := git.Version()
-
-	// receive.MaxInputSize is only available since Git 2.11.0
-	// Skip this test from the job that uses Git 2.9.0
-	if currentGitVersion != "2.9.0" {
-		_, _, err = testCloneAndPush(t, serverSocketPath, pushParams{storageName: testRepo.GetStorageName(), glID: "1", gitConfigOptions: []string{"receive.MaxInputSize=1"}})
-		if err == nil {
-			t.Errorf("local and remote head equal. push did not fail")
-		}
+	_, _, err = testCloneAndPush(t, serverSocketPath, pushParams{storageName: testRepo.GetStorageName(), glID: "1", gitConfigOptions: []string{"receive.MaxInputSize=1"}})
+	if err == nil {
+		t.Errorf("local and remote head equal. push did not fail")
 	}
 }