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

change: error logs for getting window size

Browse Source
This commit is contained in:
lilong.129
2024-09-14 10:26:07 +08:00
parent bfbd4ba6e6
commit 51c17eda77
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/android_adb_driver.go
+1 -1
View File
@@ -77,7 +77,7 @@ func (ad *adbDriver) getWindowSize() (size Size, err error) {
// adb shell wm size // adb shell wm size
output, err := ad.adbClient.RunShellCommand("wm", "size") output, err := ad.adbClient.RunShellCommand("wm", "size")
if err != nil { 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 // output may contain both Physical and Override size, use Override if existed
hrp/pkg/uixt/android_uia2_driver.go
+2 -2
View File
@@ -228,11 +228,11 @@ func (ud *uiaDriver) WindowSize() (size Size, err error) {
} else { } else {
var rawResp rawResponse var rawResp rawResponse
if rawResp, err = ud.httpGET("/session", ud.session.ID, "window/:windowHandle/size"); err != nil { 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 } }) reply := new(struct{ Value struct{ Size } })
if err = json.Unmarshal(rawResp, reply); err != nil { 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 size = reply.Value.Size
ud.windowSize = &size ud.windowSize = &size
hrp/pkg/uixt/ios_driver.go
+2 -2
View File
@@ -198,11 +198,11 @@ func (wd *wdaDriver) WindowSize() (size Size, err error) {
} else { } else {
var rawResp rawResponse var rawResp rawResponse
if rawResp, err = wd.httpGET("/session", wd.session.ID, "/window/size"); err != nil { 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 } }) reply := new(struct{ Value struct{ Size } })
if err = json.Unmarshal(rawResp, reply); err != nil { 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 size = reply.Value.Size
scale, err := wd.Scale() scale, err := wd.Scale()