Attempt to prevent intermittent failure TestGit/xxx/BranchProtectMerge/MergePR

One of the repeated intermittent failures we see in testing is a failure due to
branches not being ready to merge.

Prior to the immediate queue implementation we would attempt to flush all the queues
and this would prevent the issue. However, the immediate queue is not flushable so
the flushall is not successful at preventing this.

This PR proposes an alternative solution - wait some time and try again up to 5 times.

If this fails then there is a genuine issue and we should fail.

Related go-gitea#17719

Signed-off-by: Andrew Thornton <[email protected]>

Author: zeripath

integrations/api_helper_for_declarative_test.go

@@ -269,11 +269,15 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
 
 		resp := ctx.Session.MakeRequest(t, req, NoExpectedStatus)
 
-		if resp.Code == http.StatusMethodNotAllowed {
+		for i := 0; i < 5; i++ {
+			if resp.Code != http.StatusMethodNotAllowed {
+				break
+			}
 			err := api.APIError{}
 			DecodeJSON(t, resp, &err)
 			assert.EqualValues(t, "Please try again later", err.Message)
 			queue.GetManager().FlushAll(context.Background(), 5*time.Second)
+			<-time.After(1 * time.Second)
 			req = NewRequestWithJSON(t, http.MethodPost, urlStr, &forms.MergePullRequestForm{
 				MergeMessageField: "doAPIMergePullRequest Merge",
 				Do:                string(repo_model.MergeStyleMerge),