GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-12 02:21:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: wda driver httpRequest retry

Browse Source
This commit is contained in:
lilong.129
2024-12-12 12:06:02 +08:00
parent 60dd9a24da
commit 27da246527
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v5.0.0+2412111615
v5.0.0+2412121206

18
hrp/pkg/uixt/ios_wda_driver.go
View File

@@ -48,21 +48,23 @@ func (wd *wdaDriver) resetSession() error {
return nil
}
func (wd *wdaDriver) httpRequest(method string, rawURL string, rawBody []byte, disableRetry ...bool) (rawResp rawResponse, err error) {
disableRetryBool := len(disableRetry) > 0 && disableRetry[0]
for retryCount := 1; retryCount <= 2; retryCount++ {
func (wd *wdaDriver) httpRequest(method string, rawURL string, rawBody []byte) (rawResp rawResponse, err error) {
retryInterval := 3 * time.Second
for retryCount := 1; retryCount <= 3; retryCount++ {
rawResp, err = wd.Driver.httpRequest(method, rawURL, rawBody)
if err == nil || disableRetryBool {
if err == nil {
return
}
// TODO: polling WDA to check if resumed automatically
time.Sleep(5 * time.Second)
retryInterval = retryInterval * 2
time.Sleep(retryInterval)
oldSessionID := wd.session.ID
if err2 := wd.resetSession(); err2 != nil {
log.Err(err2).Msgf("failed to reset wda driver, retry count: %v", retryCount)
continue
}
log.Debug().Str("new session", wd.session.ID).Str("old session", oldSessionID).Msgf("successful to reset wda driver, retry count: %v", retryCount)
log.Debug().Str("new session", wd.session.ID).Str("old session", oldSessionID).
Msgf("reset wda driver session successfully, retry count: %v", retryCount)
if oldSessionID != "" {
rawURL = strings.Replace(rawURL, oldSessionID, wd.session.ID, 1)
}
@@ -74,10 +76,6 @@ func (wd *wdaDriver) httpGET(pathElem ...string) (rawResp rawResponse, err error
return wd.httpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil)
}
func (wd *wdaDriver) httpGETWithRetry(pathElem ...string) (rawResp rawResponse, err error) {
return wd.httpRequest(http.MethodGet, wd.concatURL(nil, pathElem...), nil, true)
}
func (wd *wdaDriver) httpPOST(data interface{}, pathElem ...string) (rawResp rawResponse, err error) {
var bsJSON []byte = nil
if data != nil {