mirror of
https://github.com/httprunner/httprunner.git
synced 2026-06-02 06:19:34 +08:00
Merge branch 'v5' into wings
This commit is contained in:
@@ -45,6 +45,14 @@ func NewStubAndroidDriver(dev *uixt.AndroidDevice) (*StubAndroidDriver, error) {
|
||||
ADBDriver: adbDriver,
|
||||
}
|
||||
|
||||
// setup driver
|
||||
if err := driver.Setup(); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// register driver session reset handler
|
||||
driver.Session.RegisterResetHandler(driver.Setup)
|
||||
|
||||
return driver, nil
|
||||
}
|
||||
|
||||
@@ -268,11 +276,6 @@ func (sad *StubAndroidDriver) LogoutNoneUI(packageName string) error {
|
||||
log.Err(err).Msgf("%v", res)
|
||||
return err
|
||||
}
|
||||
fmt.Printf("%v", resp)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
time.Sleep(3 * time.Second)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
@@ -44,6 +44,9 @@ func NewStubIOSDriver(dev *uixt.IOSDevice) (*StubIOSDriver, error) {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// register driver session reset handler
|
||||
driver.Session.RegisterResetHandler(driver.Setup)
|
||||
|
||||
return driver, nil
|
||||
}
|
||||
|
||||
@@ -114,13 +117,11 @@ func (s *StubIOSDriver) Source(srcOpt ...option.SourceOption) (string, error) {
|
||||
|
||||
func (s *StubIOSDriver) OpenUrl(urlStr string, opts ...option.ActionOption) (err error) {
|
||||
targetUrl := fmt.Sprintf("/openURL?url=%s", url.QueryEscape(urlStr))
|
||||
fmt.Sprintln(targetUrl)
|
||||
resp, err := s.Session.GET(targetUrl)
|
||||
_, err = s.Session.GET(targetUrl)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Msg("get source err")
|
||||
return nil
|
||||
}
|
||||
fmt.Sprintln(resp)
|
||||
return nil
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user