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

feat: add Init for driver

Browse Source
This commit is contained in:
lilong.129
2024-12-19 13:25:36 +08:00
parent 75f3853b79
commit dcd252f802
4 changed files with 21 additions and 8 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+2412191212
v5.0.0+2412191325

7
hrp/pkg/uixt/android_device.go
View File

@@ -193,13 +193,6 @@ func (dev *AndroidDevice) Options() (deviceOptions []AndroidDeviceOption) {
func (dev *AndroidDevice) Init() error {
dev.d.RunShellCommand("ime", "enable", UnicodeImePackageName)
dev.d.RunShellCommand("rm", "-r", config.DeviceActionLogFilePath)
// Notice: brighten should be executed before unlock
// brighten android device screen
dev.d.RunShellCommand("input", "keyevent", fmt.Sprintf("%d", KCWakeup))
// unlock android device screen
dev.d.RunShellCommand("input", "keyevent", fmt.Sprintf("%d", KCMenu))
// swipe up to unlock
dev.d.RunShellCommand("input", "swipe", "540", "1000", "540", "500")
if dev.UIA2 {
// uiautomator2 server must be started before

11
hrp/pkg/uixt/ext.go
View File

@@ -53,6 +53,17 @@ func newDriverExt(device IDevice, driver IWebDriver, options ...DriverOption) (d
return dExt, nil
}
func (dExt *DriverExt) Init() error {
// unlock device screen
err := dExt.Driver.Unlock()
if err != nil {
log.Error().Err(err).Msg("unlock device screen failed")
return err
}
return nil
}
func (dExt *DriverExt) assertOCR(text, assert string) error {
var options []ActionOption
options = append(options, WithScreenShotFileName(fmt.Sprintf("assert_ocr_%s", text)))

9
hrp/runner.go
View File

@@ -426,6 +426,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
if err != nil {
return nil, err
}
if err := driver.Init(); err != nil {
return nil, err
}
r.uixtDrivers[device.SerialNumber] = driver
}
// parse iOS devices config
@@ -446,6 +449,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
if err != nil {
return nil, err
}
if err := driver.Init(); err != nil {
return nil, err
}
r.uixtDrivers[device.UDID] = driver
}
// parse harmony devices config
@@ -466,6 +472,9 @@ func (r *CaseRunner) parseConfig() (parsedConfig *TConfig, err error) {
if err != nil {
return nil, err
}
if err := driver.Init(); err != nil {
return nil, err
}
r.uixtDrivers[device.ConnectKey] = driver
}