mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 23:51:25 +08:00
feat: update adb shell timeout
This commit is contained in:
@@ -1 +1 @@
|
|||||||
v4.5.0.202405061137
|
v4.5.1.install
|
||||||
@@ -4,6 +4,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
|
"time"
|
||||||
|
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
@@ -209,8 +210,8 @@ func (c Client) KillServer() (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) createTransport() (tp transport, err error) {
|
func (c Client) createTransport(readTimeout ...time.Duration) (tp transport, err error) {
|
||||||
return newTransport(fmt.Sprintf("%s:%d", c.host, c.port))
|
return newTransport(fmt.Sprintf("%s:%d", c.host, c.port), readTimeout...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (c Client) executeCommand(command string, onlyVerifyResponse ...bool) (resp string, err error) {
|
func (c Client) executeCommand(command string, onlyVerifyResponse ...bool) (resp string, err error) {
|
||||||
|
|||||||
@@ -406,8 +406,8 @@ func (d *Device) EnableAdbOverTCP(port ...int) (err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Device) createDeviceTransport() (tp transport, err error) {
|
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)); err != nil {
|
if tp, err = newTransport(fmt.Sprintf("%s:%d", d.adbClient.host, d.adbClient.port), readTimeout...); err != nil {
|
||||||
return transport{}, err
|
return transport{}, err
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -546,7 +546,7 @@ func (d *Device) installViaABBExec(apk io.ReadSeeker, args ...string) (raw []byt
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
if tp, err = d.createDeviceTransport(); err != nil {
|
if tp, err = d.createDeviceTransport(5 * time.Minute); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
defer func() { _ = tp.Close() }()
|
defer func() { _ = tp.Close() }()
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ import (
|
|||||||
|
|
||||||
var ErrConnBroken = errors.New("socket connection broken")
|
var ErrConnBroken = errors.New("socket connection broken")
|
||||||
|
|
||||||
var DefaultAdbReadTimeout time.Duration = 60
|
var DefaultAdbReadTimeout time.Duration = 300
|
||||||
|
|
||||||
var regexDeviceOffline = regexp.MustCompile("device .* not found")
|
var regexDeviceOffline = regexp.MustCompile("device .* not found")
|
||||||
|
|
||||||
|
|||||||
@@ -359,7 +359,7 @@ func (dev *AndroidDevice) installViaInstaller(app io.ReadSeeker, args ...string)
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
// 等待安装完成或超时
|
// 等待安装完成或超时
|
||||||
timeout := 1 * time.Minute
|
timeout := 3 * time.Minute
|
||||||
select {
|
select {
|
||||||
case err := <-done:
|
case err := <-done:
|
||||||
return err
|
return err
|
||||||
|
|||||||
Reference in New Issue
Block a user