From 8ae5548188ed791aa2abfb50be251608989f40cb Mon Sep 17 00:00:00 2001 From: zeripath Date: Sun, 8 Nov 2020 19:23:00 +0000 Subject: [PATCH] 2nd attempt at re-request APIMergePullRequest (#13468) Signed-off-by: Andrew Thornton --- integrations/api_helper_for_declarative_test.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/integrations/api_helper_for_declarative_test.go b/integrations/api_helper_for_declarative_test.go index b0031ef3329..b8e513958e8 100644 --- a/integrations/api_helper_for_declarative_test.go +++ b/integrations/api_helper_for_declarative_test.go @@ -235,6 +235,10 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64) DecodeJSON(t, resp, &err) assert.EqualValues(t, "Please try again later", err.Message) queue.GetManager().FlushAll(context.Background(), 5*time.Second) + req = NewRequestWithJSON(t, http.MethodPost, urlStr, &auth.MergePullRequestForm{ + MergeMessageField: "doAPIMergePullRequest Merge", + Do: string(models.MergeStyleMerge), + }) resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus) }