GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-06-09 01:39:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use DeviceHTTPDriverError when request driver failed

Browse Source
This commit is contained in:
lilong.129
2025-07-16 00:41:42 +08:00
parent 6dfeb02677
commit a3b55348ce
3 changed files with 12 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
uixt/driver_session.go
View File

@@ -155,33 +155,21 @@ func (s *DriverSession) buildURL(urlStr string) (string, error) {
} }
func (s *DriverSession) GET(urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) { func (s *DriverSession) GET(urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) {
rawResp, err = s.RequestWithRetry(http.MethodGet, urlStr, nil, opts...) return s.RequestWithRetry(http.MethodGet, urlStr, nil, opts...)
if err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, err.Error())
}
return rawResp, nil
} }
func (s *DriverSession) POST(data interface{}, urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) { func (s *DriverSession) POST(data interface{}, urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) {
var bsJSON []byte = nil var bsJSON []byte = nil
if data != nil { if data != nil {
if bsJSON, err = json.Marshal(data); err != nil { if bsJSON, err = json.Marshal(data); err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, err.Error()) return nil, errors.Wrap(code.InvalidParamError, err.Error())
} }
} }
rawResp, err = s.RequestWithRetry(http.MethodPost, urlStr, bsJSON, opts...) return s.RequestWithRetry(http.MethodPost, urlStr, bsJSON, opts...)
if err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, err.Error())
}
return rawResp, nil
} }
func (s *DriverSession) DELETE(urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) { func (s *DriverSession) DELETE(urlStr string, opts ...option.ActionOption) (rawResp DriverRawResponse, err error) {
rawResp, err = s.RequestWithRetry(http.MethodDelete, urlStr, nil, opts...) return s.RequestWithRetry(http.MethodDelete, urlStr, nil, opts...)
if err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, err.Error())
}
return rawResp, nil
} }
func (s *DriverSession) RequestWithRetry(method string, urlStr string, rawBody []byte, opts ...option.ActionOption) ( func (s *DriverSession) RequestWithRetry(method string, urlStr string, rawBody []byte, opts ...option.ActionOption) (
@@ -205,7 +193,8 @@ func (s *DriverSession) RequestWithRetry(method string, urlStr string, rawBody [
return rawResp, nil return rawResp, nil
} }
lastError = err // Notice: use DeviceHTTPDriverError when request driver failed
lastError = errors.Wrap(code.DeviceHTTPDriverError, err.Error())
log.Warn().Err(err).Msgf("request failed, attempt %d/%d", attempt, s.maxRetry) log.Warn().Err(err).Msgf("request failed, attempt %d/%d", attempt, s.maxRetry)
// If this was the last attempt, break // If this was the last attempt, break

3
uixt/ios_device.go
View File

@@ -231,8 +231,7 @@ func (dev *IOSDevice) NewDriver() (driver IDriver, err error) {
if dev.Options.ResetHomeOnStartup { if dev.Options.ResetHomeOnStartup {
log.Info().Msg("go back to home screen") log.Info().Msg("go back to home screen")
if err = wdaDriver.Home(); err != nil { if err = wdaDriver.Home(); err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, return nil, errors.Wrap(err, "go back to home screen failed")
fmt.Sprintf("go back to home screen failed: %v", err))
} }
} }
if dev.Options.LogOn { if dev.Options.LogOn {

12
uixt/ios_driver_wda.go
View File

@@ -196,7 +196,7 @@ func (wd *WDADriver) DeviceInfo() (deviceInfo types.DeviceInfo, err error) {
// [[FBRoute GET:@"/wda/device/info"].withoutSession // [[FBRoute GET:@"/wda/device/info"].withoutSession
var rawResp DriverRawResponse var rawResp DriverRawResponse
if rawResp, err = wd.Session.GET("/wda/device/info"); err != nil { if rawResp, err = wd.Session.GET("/wda/device/info"); err != nil {
return types.DeviceInfo{}, errors.Wrap(code.DeviceHTTPDriverError, err.Error()) return types.DeviceInfo{}, err
} }
reply := new(struct{ Value struct{ types.DeviceInfo } }) reply := new(struct{ Value struct{ types.DeviceInfo } })
if err = json.Unmarshal(rawResp, reply); err != nil { if err = json.Unmarshal(rawResp, reply); err != nil {
@@ -298,12 +298,12 @@ func (wd *WDADriver) ScreenShot(opts ...option.ActionOption) (raw *bytes.Buffer,
// [[FBRoute GET:@"/screenshot"].withoutSession respondWithTarget:self action:@selector(handleGetScreenshot:)] // [[FBRoute GET:@"/screenshot"].withoutSession respondWithTarget:self action:@selector(handleGetScreenshot:)]
rawResp, err := wd.Session.GET("/screenshot") rawResp, err := wd.Session.GET("/screenshot")
if err != nil { if err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, return nil, errors.Wrap(code.DeviceScreenShotError,
fmt.Sprintf("WDA screenshot failed %v", err)) fmt.Sprintf("WDA screenshot failed %v", err))
} }
raw, err = rawResp.ValueDecodeAsBase64() raw, err = rawResp.ValueDecodeAsBase64()
if err != nil { if err != nil {
return nil, errors.Wrap(code.DeviceHTTPDriverError, return nil, errors.Wrap(code.DeviceScreenShotError,
fmt.Sprintf("decode WDA screenshot data failed: %v", err)) fmt.Sprintf("decode WDA screenshot data failed: %v", err))
} }
return raw, nil return raw, nil
@@ -454,8 +454,7 @@ func (wd *WDADriver) AppLaunch(bundleId string) (err error) {
} }
_, err = wd.Session.POST(data, "/wings/apps/launch") _, err = wd.Session.POST(data, "/wings/apps/launch")
if err != nil { if err != nil {
return errors.Wrap(code.DeviceHTTPDriverError, return errors.Wrap(err, "wda app launch failed")
fmt.Sprintf("wda launch failed: %v", err))
} }
return nil return nil
} }
@@ -466,8 +465,7 @@ func (wd *WDADriver) AppLaunchUnattached(bundleId string) (err error) {
data := map[string]interface{}{"bundleId": bundleId} data := map[string]interface{}{"bundleId": bundleId}
_, err = wd.Session.POST(data, "/wda/apps/launchUnattached") _, err = wd.Session.POST(data, "/wda/apps/launchUnattached")
if err != nil { if err != nil {
return errors.Wrap(code.DeviceHTTPDriverError, return errors.Wrap(err, "wda app launchUnattached failed")
fmt.Sprintf("wda launchUnattached failed: %v", err))
} }
return nil return nil
} }