Merge branch 'fix-rebase-test-flake' into 'master'

Fix flaky rebase test

See merge request gitlab-org/gitaly!1028

2 files changed, 10 insertions, 4 deletions

diff --git a/changelogs/unreleased/fix-rebase-test-flake.yml b/changelogs/unreleased/fix-rebase-test-flake.yml
new file mode 100644
index 000000000..2377849d5
--- /dev/null
+++ b/changelogs/unreleased/fix-rebase-test-flake.yml
@@ -0,0 +1,5 @@
+---
+title: Fix flaky rebase test
+merge_request: 1028
+author:
+type: fixed
diff --git a/internal/service/operations/rebase_test.go b/internal/service/operations/rebase_test.go
index 79c8c2e5c..0ac8eb44f 100644
--- a/internal/service/operations/rebase_test.go
+++ b/internal/service/operations/rebase_test.go
@@ -1,6 +1,7 @@
 package operations_test
 
 import (
+	"fmt"
 	"strings"
 	"testing"
 
@@ -90,23 +91,23 @@ func TestFailedUserRebaseRequestDueToPreReceiveError(t *testing.T) {
 	request := &gitalypb.UserRebaseRequest{
 		Repository:       testRepo,
 		User:             user,
-		RebaseId:         "1",
 		Branch:           []byte(branchName),
 		BranchSha:        branchSha,
 		RemoteRepository: testRepoCopy,
 		RemoteBranch:     []byte("master"),
 	}
 
-	hookContent := []byte("#!/bin/sh\necho GL_ID=$GL_ID\nexit 1")
-	for _, hookName := range operations.GitlabPreHooks {
+	hookContent := []byte("#!/bin/sh\necho GL_ID=$GL_ID\nexit 1\n")
+	for i, hookName := range operations.GitlabPreHooks {
 		t.Run(hookName, func(t *testing.T) {
 			remove, err := operations.OverrideHooks(hookName, hookContent)
-			require.NoError(t, err)
+			require.NoError(t, err, "set up hooks override")
 			defer remove()
 
 			md := testhelper.GitalyServersMetadata(t, serverSocketPath)
 			ctx := metadata.NewOutgoingContext(ctxOuter, md)
 
+			request.RebaseId = fmt.Sprintf("%d", i+1)
 			response, err := client.UserRebase(ctx, request)
 			require.NoError(t, err)
 			require.Contains(t, response.PreReceiveError, "GL_ID="+user.GlId)