mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-12 11:29:48 +08:00
change: error logs for getting window size
This commit is contained in:
@@ -77,7 +77,7 @@ func (ad *adbDriver) getWindowSize() (size Size, err error) {
|
||||
// adb shell wm size
|
||||
output, err := ad.adbClient.RunShellCommand("wm", "size")
|
||||
if err != nil {
|
||||
return size, errors.Wrap(err, "get window size failed with adb")
|
||||
return size, errors.Wrap(err, "get window size failed by adb shell")
|
||||
}
|
||||
|
||||
// output may contain both Physical and Override size, use Override if existed
|
||||
|
||||
@@ -228,11 +228,11 @@ func (ud *uiaDriver) WindowSize() (size Size, err error) {
|
||||
} else {
|
||||
var rawResp rawResponse
|
||||
if rawResp, err = ud.httpGET("/session", ud.session.ID, "window/:windowHandle/size"); err != nil {
|
||||
return Size{}, errors.Wrap(err, "get window size failed with uiautomator2")
|
||||
return Size{}, errors.Wrap(err, "get window size failed by UIA2 request")
|
||||
}
|
||||
reply := new(struct{ Value struct{ Size } })
|
||||
if err = json.Unmarshal(rawResp, reply); err != nil {
|
||||
return Size{}, err
|
||||
return Size{}, errors.Wrap(err, "get window size failed by UIA2 response")
|
||||
}
|
||||
size = reply.Value.Size
|
||||
ud.windowSize = &size
|
||||
|
||||
@@ -198,11 +198,11 @@ func (wd *wdaDriver) WindowSize() (size Size, err error) {
|
||||
} else {
|
||||
var rawResp rawResponse
|
||||
if rawResp, err = wd.httpGET("/session", wd.session.ID, "/window/size"); err != nil {
|
||||
return Size{}, errors.Wrap(err, "get window size failed with wda")
|
||||
return Size{}, errors.Wrap(err, "get window size failed by WDA request")
|
||||
}
|
||||
reply := new(struct{ Value struct{ Size } })
|
||||
if err = json.Unmarshal(rawResp, reply); err != nil {
|
||||
return Size{}, err
|
||||
return Size{}, errors.Wrap(err, "get window size failed by WDA response")
|
||||
}
|
||||
size = reply.Value.Size
|
||||
scale, err := wd.Scale()
|
||||
|
||||
Reference in New Issue
Block a user