From 66dcf10845fe494832b44bd20b336f5099a72e8f Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Sun, 25 Oct 2020 20:56:51 +0000
Subject: [PATCH] Attempt to handle unready PR in tests (#13305)
Signed-off-by: Andrew Thornton <art27@cantab.net>
---
.../api_helper_for_declarative_test.go | 25 ++++++++++++++++---
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/integrations/api_helper_for_declarative_test.go b/integrations/api_helper_for_declarative_test.go
index 51335c82168..b0031ef3329 100644
--- a/integrations/api_helper_for_declarative_test.go
+++ b/integrations/api_helper_for_declarative_test.go
@@ -5,14 +5,17 @@
package integrations
import (
+ "context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"testing"
+ "time"
"code.gitea.io/gitea/models"
"code.gitea.io/gitea/modules/auth"
+ "code.gitea.io/gitea/modules/queue"
api "code.gitea.io/gitea/modules/structs"
"github.com/stretchr/testify/assert"
@@ -225,11 +228,25 @@ func doAPIMergePullRequest(ctx APITestContext, owner, repo string, index int64)
Do: string(models.MergeStyleMerge),
})
- if ctx.ExpectedCode != 0 {
- ctx.Session.MakeRequest(t, req, ctx.ExpectedCode)
- return
+ resp := ctx.Session.MakeRequest(t, req, NoExpectedStatus)
+
+ if resp.Code == http.StatusMethodNotAllowed {
+ err := api.APIError{}
+ DecodeJSON(t, resp, &err)
+ assert.EqualValues(t, "Please try again later", err.Message)
+ queue.GetManager().FlushAll(context.Background(), 5*time.Second)
+ resp = ctx.Session.MakeRequest(t, req, NoExpectedStatus)
+ }
+
+ expected := ctx.ExpectedCode
+ if expected == 0 {
+ expected = 200
+ }
+
+ if !assert.EqualValues(t, expected, resp.Code,
+ "Request: %s %s", req.Method, req.URL.String()) {
+ logUnexpectedResponse(t, resp)
}
- ctx.Session.MakeRequest(t, req, 200)
}
}