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

feat: update adb shell timeout

Browse Source
This commit is contained in:
余泓铮
2024-05-21 14:55:01 +08:00
parent 996bcab705
commit 918550b46e
5 changed files with 9 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 @@
v4.5.0.202405061137
v4.5.1.install

5
hrp/pkg/gadb/client.go
View File

@@ -4,6 +4,7 @@ import (
"fmt"
"strconv"
"strings"
"time"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
@@ -209,8 +210,8 @@ func (c Client) KillServer() (err error) {
return
}
func (c Client) createTransport() (tp transport, err error) {
return newTransport(fmt.Sprintf("%s:%d", c.host, c.port))
func (c Client) createTransport(readTimeout ...time.Duration) (tp transport, err error) {
return newTransport(fmt.Sprintf("%s:%d", c.host, c.port), readTimeout...)
}
func (c Client) executeCommand(command string, onlyVerifyResponse ...bool) (resp string, err error) {

6
hrp/pkg/gadb/device.go
View File

@@ -406,8 +406,8 @@ func (d *Device) EnableAdbOverTCP(port ...int) (err error) {
return
}
func (d *Device) createDeviceTransport() (tp transport, err error) {
if tp, err = newTransport(fmt.Sprintf("%s:%d", d.adbClient.host, d.adbClient.port)); err != nil {
func (d *Device) createDeviceTransport(readTimeout ...time.Duration) (tp transport, err error) {
if tp, err = newTransport(fmt.Sprintf("%s:%d", d.adbClient.host, d.adbClient.port), readTimeout...); err != nil {
return transport{}, err
}
@@ -546,7 +546,7 @@ func (d *Device) installViaABBExec(apk io.ReadSeeker, args ...string) (raw []byt
if err != nil {
return nil, err
}
if tp, err = d.createDeviceTransport(); err != nil {
if tp, err = d.createDeviceTransport(5 * time.Minute); err != nil {
return nil, err
}
defer func() { _ = tp.Close() }()

2
hrp/pkg/gadb/transport.go
View File

@@ -17,7 +17,7 @@ import (
var ErrConnBroken = errors.New("socket connection broken")
var DefaultAdbReadTimeout time.Duration = 60
var DefaultAdbReadTimeout time.Duration = 300
var regexDeviceOffline = regexp.MustCompile("device .* not found")

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

@@ -359,7 +359,7 @@ func (dev *AndroidDevice) installViaInstaller(app io.ReadSeeker, args ...string)
return err
}
// 等待安装完成或超时
timeout := 1 * time.Minute
timeout := 3 * time.Minute
select {
case err := <-done:
return err