GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-06 20:32:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: improve package running check and enhance logging in UIA2Driver

Browse Source
This commit is contained in:
lilong.129
2025-06-28 10:17:09 +08:00
parent e8f7516422
commit 3424844815
2 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/gadb/device.go
View File

@@ -728,7 +728,16 @@ func (d *Device) IsPackageInstalled(packageName string) bool {
}
func (d *Device) IsPackageRunning(packageName string) bool {
output, err := d.RunShellCommand("pidof", packageName)
packageName = strings.TrimSpace(packageName)
if packageName == "" {
log.Error().Msg("package name is empty, skip checking package running")
return false
}
// Use ps -ef command with grep to check if package is running
// ps -ef shows full command line which includes package name as argument
// This works for both regular apps and instrumentation test processes
output, err := d.RunShellCommand("ps -ef | grep " + packageName + " | grep -v grep")
if err != nil {
return false
}

30
uixt/android_driver_uia2.go
View File

@@ -62,7 +62,7 @@ func (ud *UIA2Driver) Setup() error {
localPort, ud.Device.Options.UIA2Port)
ud.Session.SetBaseURL(baseURL)
// uiautomator2 server must be started before
// Notice: uiautomator2 server must be started before running test
// check uiautomator server package installed
if !ud.Device.IsPackageInstalled(ud.Device.Options.UIA2ServerPackageName) {
@@ -74,19 +74,19 @@ func (ud *UIA2Driver) Setup() error {
"%s not installed", ud.Device.Options.UIA2ServerTestPackageName)
}
// TODO: check uiautomator server package running
// if dev.IsPackageRunning(UIA2ServerPackageName) {
// return nil
// }
// start uiautomator2 server
// Todo: keep-alive
go func() {
if err := ud.startUIA2Server(); err != nil {
log.Fatal().Err(err).Msg("start UIA2 failed")
}
}()
time.Sleep(5 * time.Second) // wait for uiautomator2 server start
// check uiautomator server package running
if ud.Device.IsPackageRunning(ud.Device.Options.UIA2ServerTestPackageName) {
log.Info().Str("package", ud.Device.Options.UIA2ServerTestPackageName).
Msg("uiautomator2 server is already running, skip starting")
} else {
// start uiautomator2 server
go func() {
if err := ud.startUIA2Server(); err != nil {
log.Fatal().Err(err).Msg("start UIA2 failed")
}
}()
time.Sleep(5 * time.Second) // wait for uiautomator2 server start
}
// create new session
err = ud.InitSession(nil)
@@ -604,7 +604,7 @@ func (ud *UIA2Driver) startUIA2Server() error {
log.Error().Err(err).Int("retryCount", maxRetries).Msg("start uiautomator server failed, retrying...")
}
if strings.Contains(out, "Process crashed") {
log.Error().Msg("uiautomator server crashed, retrying...")
log.Error().Str("output", out).Msg("uiautomator server crashed, retrying...")
}
}