From 797cb38a4a6e702f959dceeb35d8503133879892 Mon Sep 17 00:00:00 2001 From: 6543 <6543@obermui.de> Date: Tue, 10 Nov 2020 03:55:48 +0100 Subject: [PATCH] 2nd attempt at re-request APIMergePullRequest (#13468) (#13490) Signed-off-by: Andrew Thornton Co-authored-by: zeripath --- 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 b0031ef33..b8e513958 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) }