mirror of
https://github.com/httprunner/httprunner.git
synced 2026-07-09 22:44:05 +08:00
降低wda初始化接口调用
This commit is contained in:
@@ -217,6 +217,7 @@ func (dev *IOSDevice) getAppInfo(packageName string) (appInfo types.AppInfo, err
|
|||||||
|
|
||||||
func (dev *IOSDevice) NewDriver() (driver IDriver, err error) {
|
func (dev *IOSDevice) NewDriver() (driver IDriver, err error) {
|
||||||
wdaDriver, err := NewWDADriver(dev)
|
wdaDriver, err := NewWDADriver(dev)
|
||||||
|
_, _ = wdaDriver.Status()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "failed to init WDA driver")
|
return nil, errors.Wrap(err, "failed to init WDA driver")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -41,14 +41,6 @@ func NewWDADriver(device *IOSDevice) (*WDADriver, error) {
|
|||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
// check WDA status
|
|
||||||
wdaStatus, err := driver.Status()
|
|
||||||
if err != nil {
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
log.Info().Interface("status", wdaStatus).
|
|
||||||
Msg("check WDA status")
|
|
||||||
|
|
||||||
// register driver session reset handler
|
// register driver session reset handler
|
||||||
driver.Session.RegisterResetHandler(driver.Setup)
|
driver.Session.RegisterResetHandler(driver.Setup)
|
||||||
|
|
||||||
@@ -157,10 +149,6 @@ func (wd *WDADriver) Setup() error {
|
|||||||
return errors.Wrap(code.DeviceHTTPDriverError, err.Error())
|
return errors.Wrap(code.DeviceHTTPDriverError, err.Error())
|
||||||
}
|
}
|
||||||
|
|
||||||
// init WDA scale
|
|
||||||
if wd.scale, err = wd.Scale(); err != nil {
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -329,9 +317,10 @@ func (wd *WDADriver) ScreenShot(opts ...option.ActionOption) (raw *bytes.Buffer,
|
|||||||
func (wd *WDADriver) toScale(x float64) float64 {
|
func (wd *WDADriver) toScale(x float64) float64 {
|
||||||
if wd.scale == 0 {
|
if wd.scale == 0 {
|
||||||
// not setup yet
|
// not setup yet
|
||||||
if err := wd.Setup(); err != nil {
|
var err error
|
||||||
|
if wd.scale, err = wd.Scale(); err != nil {
|
||||||
log.Error().Err(err).Msg("init scale failed")
|
log.Error().Err(err).Msg("init scale failed")
|
||||||
os.Exit(code.GetErrorCode(err))
|
// Todo: os.Exit(code.GetErrorCode(err)) 添加error处理。
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return x / wd.scale
|
return x / wd.scale
|
||||||
|
|||||||
Reference in New Issue
Block a user