Merge branch 'sh-remove-gogit-test' into 'master'

Remove another test that exercises gogit feature flag

See merge request gitlab-org/gitaly!1086

2 files changed, 5 insertions, 9 deletions

diff --git a/changelogs/unreleased/sh-remove-gogit-test.yml b/changelogs/unreleased/sh-remove-gogit-test.yml
new file mode 100644
index 000000000..831c28239
--- /dev/null
+++ b/changelogs/unreleased/sh-remove-gogit-test.yml
@@ -0,0 +1,5 @@
+---
+title: Remove another test that exercises gogit feature flag
+merge_request: 1086
+author:
+type: other
diff --git a/internal/service/commit/find_commit_test.go b/internal/service/commit/find_commit_test.go
index 12d730e69..d5935beb5 100644
--- a/internal/service/commit/find_commit_test.go
+++ b/internal/service/commit/find_commit_test.go
@@ -9,12 +9,10 @@ import (
 	"github.com/golang/protobuf/ptypes/timestamp"
 	"github.com/stretchr/testify/require"
 	"gitlab.com/gitlab-org/gitaly-proto/go/gitalypb"
-	"gitlab.com/gitlab-org/gitaly/internal/featureflag"
 	"gitlab.com/gitlab-org/gitaly/internal/git/log"
 	"gitlab.com/gitlab-org/gitaly/internal/helper"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
@@ -275,10 +273,6 @@ func TestFailedFindCommitRequest(t *testing.T) {
 
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
-	gogitCtx := metadata.NewOutgoingContext(
-		ctx,
-		metadata.New(map[string]string{featureflag.HeaderKey("gogit-findcommit"): "true"}),
-	)
 
 	for _, testCase := range testCases {
 		t.Run(testCase.description, func(t *testing.T) {
@@ -289,9 +283,6 @@ func TestFailedFindCommitRequest(t *testing.T) {
 
 			_, err := client.FindCommit(ctx, request)
 			require.Equal(t, codes.InvalidArgument, status.Code(err), "default lookup should fail")
-
-			_, err = client.FindCommit(gogitCtx, request)
-			require.Equal(t, codes.InvalidArgument, status.Code(err), "go-git lookup should fail")
 		})
 	}
 }