Send GlRepository to Gitaly in Workhorse tests

Gitaly requires GlRepository to be set in calls that invoke the
hooks. Rails' internal API is disabled in tests so the actual
value doesn't matter though. Fill the value anyway so the
validation passes when sending requests to Gitaly.

workhorse/cmd/gitlab-workhorse/gitaly_integration_test.go

@@ -174,32 +174,31 @@ func TestAllowedShallowClone(t *testing.T) {
 	}
 }
 
-// Disabled because of the broken master
-// func TestAllowedPush(t *testing.T) {
-// 	skipUnlessRealGitaly(t)
-
-// 	for _, gitalyAddress := range gitalyAddresses {
-// 		t.Run(gitalyAddress, func(t *testing.T) {
-// 			// Create the repository in the Gitaly server
-// 			apiResponse := realGitalyOkBody(t, gitalyAddress)
-// 			require.NoError(t, ensureGitalyRepository(t, apiResponse))
-
-// 			// Prepare the test server and backend
-// 			ts := testAuthServer(t, nil, nil, 200, apiResponse)
-// 			ws := startWorkhorseServer(t, ts.URL)
-
-// 			// Do the git clone
-// 			tmpDir := t.TempDir()
-// 			cloneCmd := exec.Command("git", "clone", fmt.Sprintf("%s/%s", ws.URL, testRepo), tmpDir)
-// 			runOrFail(t, cloneCmd)
-
-// 			// Perform the git push
-// 			pushCmd := exec.Command("git", "push", fmt.Sprintf("%s/%s", ws.URL, testRepo), fmt.Sprintf("master:%s", newBranch()))
-// 			pushCmd.Dir = tmpDir
-// 			runOrFail(t, pushCmd)
-// 		})
-// 	}
-// }
+func TestAllowedPush(t *testing.T) {
+	skipUnlessRealGitaly(t)
+
+	for _, gitalyAddress := range gitalyAddresses {
+		t.Run(gitalyAddress, func(t *testing.T) {
+			// Create the repository in the Gitaly server
+			apiResponse := realGitalyOkBody(t, gitalyAddress)
+			require.NoError(t, ensureGitalyRepository(t, apiResponse))
+
+			// Prepare the test server and backend
+			ts := testAuthServer(t, nil, nil, 200, apiResponse)
+			ws := startWorkhorseServer(t, ts.URL)
+
+			// Do the git clone
+			tmpDir := t.TempDir()
+			cloneCmd := exec.Command("git", "clone", fmt.Sprintf("%s/%s", ws.URL, testRepo), tmpDir)
+			runOrFail(t, cloneCmd)
+
+			// Perform the git push
+			pushCmd := exec.Command("git", "push", fmt.Sprintf("%s/%s", ws.URL, testRepo), fmt.Sprintf("master:%s", newBranch()))
+			pushCmd.Dir = tmpDir
+			runOrFail(t, pushCmd)
+		})
+	}
+}
 
 func TestAllowedGetGitBlob(t *testing.T) {
 	skipUnlessRealGitaly(t)

workhorse/cmd/gitlab-workhorse/main_test.go

@@ -795,6 +795,10 @@ func gitOkBody(t *testing.T) *api.Response {
 		Repository: gitalypb.Repository{
 			StorageName:  "default",
 			RelativePath: "foo/bar.git",
+			// Gitaly requires a GlRepository to be set in requests that invoke the hooks.
+			// Set a placeholder to pass the validation. The value doesn't actually matter
+			// as the calls into Rails' internal API are disabled in tests.
+			GlRepository: "placeholder-1",
 		},
 	}
 }