GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-08-29 03:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: logs error

Browse Source
This commit is contained in:
lilong.129
2024-09-02 17:27:27 +08:00
parent e681046fe9
commit 984b502d3b
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
hrp/pkg/uixt/android_device.go
+1 -1
View File
@@ -180,8 +180,8 @@ type AndroidDevice struct {
d *gadb.Device d *gadb.Device
logcat *AdbLogcat logcat *AdbLogcat
SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"` SerialNumber string `json:"serial,omitempty" yaml:"serial,omitempty"`
STUB bool `json:"stub,omitempty" yaml:"stub,omitempty"` // use stub
UIA2 bool `json:"uia2,omitempty" yaml:"uia2,omitempty"` // use uiautomator2 UIA2 bool `json:"uia2,omitempty" yaml:"uia2,omitempty"` // use uiautomator2
STUB bool `json:"stub,omitempty" yaml:"stub,omitempty"` // use uiautomator2
UIA2IP string `json:"uia2_ip,omitempty" yaml:"uia2_ip,omitempty"` // uiautomator2 server ip UIA2IP string `json:"uia2_ip,omitempty" yaml:"uia2_ip,omitempty"` // uiautomator2 server ip
UIA2Port int `json:"uia2_port,omitempty" yaml:"uia2_port,omitempty"` // uiautomator2 server port UIA2Port int `json:"uia2_port,omitempty" yaml:"uia2_port,omitempty"` // uiautomator2 server port
LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"` LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"`
hrp/pkg/uixt/android_stub_driver.go
+13 -12
View File
@@ -175,7 +175,14 @@ func (sad *stubAndroidDriver) Source(srcOpt ...SourceOption) (source string, err
} }
func (sad *stubAndroidDriver) LoginNoneUIBak(packageName, phoneNumber, captcha string) error { func (sad *stubAndroidDriver) LoginNoneUIBak(packageName, phoneNumber, captcha string) error {
_, err := sad.adbClient.RunShellCommand("am", "broadcast", "-a", fmt.Sprintf("%s.util.crony.action_login", packageName), "-e", "phone", phoneNumber, "-e", "code", captcha) _, err := sad.adbClient.RunShellCommand(
"am", "broadcast",
"-a", fmt.Sprintf("%s.util.crony.action_login", packageName),
"-e", "phone", phoneNumber,
"-e", "code", captcha)
if err != nil {
return err
}
time.Sleep(10 * time.Second) time.Sleep(10 * time.Second)
login, err := sad.isLogin(packageName) login, err := sad.isLogin(packageName)
if err != nil || !login { if err != nil || !login {
@@ -200,7 +207,7 @@ func (sad *stubAndroidDriver) LoginNoneUI(packageName, phoneNumber, captcha stri
} }
log.Info().Msgf("%v", res) log.Info().Msgf("%v", res)
if res["isSuccess"] != true { if res["isSuccess"] != true {
err = fmt.Errorf("falied to logout %s", res["data"]) err = fmt.Errorf("failed to login %s", res["data"])
log.Err(err).Msgf("%v", res) log.Err(err).Msgf("%v", res)
return err return err
} }
@@ -226,14 +233,11 @@ func (sad *stubAndroidDriver) LogoutNoneUI(packageName string) error {
} }
log.Info().Msgf("%v", res) log.Info().Msgf("%v", res)
if res["isSuccess"] != true { if res["isSuccess"] != true {
err = fmt.Errorf("falied to logout %s", res["data"]) err = fmt.Errorf("failed to logout %s", res["data"])
log.Err(err).Msgf("%v", res) log.Err(err).Msgf("%v", res)
return err return err
} }
fmt.Printf("%v", resp) log.Info().Interface("resp", resp).Msg("logout success")
if err != nil {
return err
}
return nil return nil
} }
@@ -263,13 +267,10 @@ func (sad *stubAndroidDriver) isLogin(packageName string) (login bool, err error
} }
log.Info().Msgf("%v", res) log.Info().Msgf("%v", res)
if res["isSuccess"] != true { if res["isSuccess"] != true {
err = fmt.Errorf("falied to get is login %s", res["data"]) err = fmt.Errorf("failed to check login %s", res["data"])
log.Err(err).Msgf("%v", res) log.Err(err).Msgf("%v", res)
return false, err return false, err
} }
fmt.Printf("%v", resp) log.Info().Interface("resp", resp).Msg("check login success")
if err != nil {
return false, err
}
return true, nil return true, nil
} }