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

feat: integrage ios performance monitor

Browse Source
This commit is contained in:
debugtalk
2022-10-10 14:06:31 +08:00
parent bfe4030431
commit cd33f01840
14 changed files with 150 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/uitest/demo_douyin_live.json
View File

@@ -6,6 +6,10 @@
},
"ios": [
{
"perf_options": {
"sys_cpu": true,
"sys_mem": true
},
"port": 8700,
"mjpeg_port": 8800,
"log_on": true

5
examples/uitest/demo_douyin_live.yaml
View File

@@ -3,7 +3,10 @@ config:
variables:
app_name: 抖音
ios:
- port: 8700
- perf_options:
sys_cpu: true
sys_mem: true
port: 8700
mjpeg_port: 8800
log_on: true
teststeps:

10
examples/uitest/demo_douyin_test.go
View File

@@ -14,7 +14,15 @@ func TestIOSDouyinLive(t *testing.T) {
WithVariables(map[string]interface{}{
"app_name": "抖音",
}).
SetIOS(hrp.WithLogOn(true), hrp.WithWDAPort(8700), hrp.WithWDAMjpegPort(8800)),
SetIOS(
hrp.WithLogOn(true),
hrp.WithWDAPort(8700),
hrp.WithWDAMjpegPort(8800),
hrp.WithPerfOptions(
hrp.WithPerfSystemCPU(true),
hrp.WithPerfSystemMem(true),
),
),
TestSteps: []hrp.IStep{
hrp.NewStep("启动抖音").
IOS().

2
go.mod
View File

@@ -88,4 +88,4 @@ require (
)
// replace github.com/httprunner/funplugin => ../funplugin
replace github.com/electricbubble/gidevice => github.com/debugtalk/gidevice v0.6.3-0.20221008035433-d79086a752a7
replace github.com/electricbubble/gidevice => github.com/debugtalk/gidevice v0.6.3-0.20221009112329-b36169c16739

4
go.sum
View File

@@ -96,8 +96,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/debugtalk/gidevice v0.6.3-0.20221008035433-d79086a752a7 h1:rxaa937c9aj3Yu4M2UZb5CLAgmPu5XXpXQEfKKSWkEw=
github.com/debugtalk/gidevice v0.6.3-0.20221008035433-d79086a752a7/go.mod h1:bRHL2M9qgeEKju8KRvKMZUVEg7t5zMnTiG3SJ3QDH5o=
github.com/debugtalk/gidevice v0.6.3-0.20221009112329-b36169c16739 h1:rMcmtiJJh28z0ILZxdq0C6A2kbobdr4zu9CtxiS6GVY=
github.com/debugtalk/gidevice v0.6.3-0.20221009112329-b36169c16739/go.mod h1:bRHL2M9qgeEKju8KRvKMZUVEg7t5zMnTiG3SJ3QDH5o=
github.com/denisbrodbeck/machineid v1.0.1 h1:geKr9qtkB876mXguW2X6TU4ZynleN6ezuMSRhl4D7AQ=
github.com/denisbrodbeck/machineid v1.0.1/go.mod h1:dJUwb7PTidGDeYyUBmXZ2GphQBbjJCrnectwCyxcUSI=
github.com/electricbubble/gadb v0.0.7 h1:fxvVLVNs3IFKuYAEXDF2tDZUjT9jNCltoTSirjM5dgo=

14
hrp/internal/uixt/ext.go
View File

@@ -131,8 +131,10 @@ type DriverExt struct {
frame *bytes.Buffer
doneMjpegStream chan bool
scale float64
StartTime time.Time // used to associate screenshots name
ScreenShots []string // save screenshots path
StartTime time.Time // used to associate screenshots name
ScreenShots []string // save screenshots path
perfStop chan struct{} // stop performance monitor
perfData []string // save perf data
CVArgs
}
@@ -154,6 +156,14 @@ func extend(driver WebDriver) (dExt *DriverExt, err error) {
return dExt, nil
}
func (dExt *DriverExt) GetPerfData() []string {
if dExt.perfStop == nil {
return nil
}
close(dExt.perfStop)
return dExt.perfData
}
func (dExt *DriverExt) takeScreenShot() (raw *bytes.Buffer, err error) {
// wait for action done
time.Sleep(500 * time.Millisecond)

93
hrp/internal/uixt/ios_device.go
View File

@@ -92,6 +92,28 @@ func InitWDAClient(device *IOSDevice) (*DriverExt, error) {
}
}
if device.PerfOptions != nil {
data, err := iosDevice.d.PerfStart(device.perfOpitons()...)
if err != nil {
return nil, err
}
driverExt.perfStop = make(chan struct{})
// start performance monitor
go func() {
for {
select {
case <-driverExt.perfStop:
iosDevice.d.PerfStop()
return
case d := <-data:
fmt.Println(string(d))
driverExt.perfData = append(driverExt.perfData, string(d))
}
}
}()
}
driverExt.UUID = iosDevice.UUID()
return driverExt, nil
}
@@ -122,6 +144,15 @@ func WithLogOn(logOn bool) IOSDeviceOption {
}
}
func WithPerfOptions(options ...giDevice.PerfOption) IOSDeviceOption {
return func(device *IOSDevice) {
device.PerfOptions = &giDevice.PerfOptions{}
for _, option := range options {
option(device.PerfOptions)
}
}
}
func IOSDevices(udid ...string) (devices []giDevice.Device, err error) {
var usbmux giDevice.Usbmux
if usbmux, err = giDevice.NewUsbmux(); err != nil {
@@ -171,11 +202,12 @@ func NewIOSDevice(options ...IOSDeviceOption) (device *IOSDevice, err error) {
}
type IOSDevice struct {
d giDevice.Device
UDID string `json:"udid,omitempty" yaml:"udid,omitempty"`
Port int `json:"port,omitempty" yaml:"port,omitempty"` // WDA remote port
MjpegPort int `json:"mjpeg_port,omitempty" yaml:"mjpeg_port,omitempty"` // WDA remote MJPEG port
LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"`
d giDevice.Device
PerfOptions *giDevice.PerfOptions `json:"perf_options,omitempty" yaml:"perf_options,omitempty"`
UDID string `json:"udid,omitempty" yaml:"udid,omitempty"`
Port int `json:"port,omitempty" yaml:"port,omitempty"` // WDA remote port
MjpegPort int `json:"mjpeg_port,omitempty" yaml:"mjpeg_port,omitempty"` // WDA remote MJPEG port
LogOn bool `json:"log_on,omitempty" yaml:"log_on,omitempty"`
}
func (dev *IOSDevice) UUID() string {
@@ -240,6 +272,57 @@ func (dev *IOSDevice) opitons() (deviceOptions []IOSDeviceOption) {
return
}
func (dev *IOSDevice) perfOpitons() (perfOptions []giDevice.PerfOption) {
if dev.PerfOptions == nil {
return
}
// system
if dev.PerfOptions.SysCPU {
perfOptions = append(perfOptions, giDevice.WithPerfSystemCPU(true))
}
if dev.PerfOptions.SysMem {
perfOptions = append(perfOptions, giDevice.WithPerfSystemMem(true))
}
if dev.PerfOptions.SysDisk {
perfOptions = append(perfOptions, giDevice.WithPerfSystemDisk(true))
}
if dev.PerfOptions.SysNetwork {
perfOptions = append(perfOptions, giDevice.WithPerfSystemNetwork(true))
}
if dev.PerfOptions.FPS {
perfOptions = append(perfOptions, giDevice.WithPerfFPS(true))
}
if dev.PerfOptions.Network {
perfOptions = append(perfOptions, giDevice.WithPerfNetwork(true))
}
// process
if dev.PerfOptions.BundleID != "" {
perfOptions = append(perfOptions,
giDevice.WithPerfBundleID(dev.PerfOptions.BundleID))
}
if dev.PerfOptions.Pid != 0 {
perfOptions = append(perfOptions,
giDevice.WithPerfPID(dev.PerfOptions.Pid))
}
// config
if dev.PerfOptions.OutputInterval != 0 {
perfOptions = append(perfOptions,
giDevice.WithPerfOutputInterval(dev.PerfOptions.OutputInterval))
}
if dev.PerfOptions.SystemAttributes != nil {
perfOptions = append(perfOptions,
giDevice.WithPerfSystemAttributes(dev.PerfOptions.SystemAttributes...))
}
if dev.PerfOptions.ProcessAttributes != nil {
perfOptions = append(perfOptions,
giDevice.WithPerfProcessAttributes(dev.PerfOptions.ProcessAttributes...))
}
return
}
// NewHTTPDriver creates new remote HTTP client, this will also start a new session.
func (dev *IOSDevice) NewHTTPDriver(capabilities Capabilities) (driver WebDriver, err error) {
localPort, err := getFreePort()

2
hrp/internal/uixt/ocr_on.go
View File

@@ -55,7 +55,7 @@ func (s *veDEMOCRService) getOCRResult(imageBuf []byte) ([]OCRResult, error) {
return nil, fmt.Errorf("close body writer error: %v", err)
}
url, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9odWJibGUuYnl0ZWRhbmNlLm5ldC92aWRlby9hcGkvdjEvYWxnb3JpdGhtL29jcg==")
url, _ := base64.StdEncoding.DecodeString("aHR0cHM6Ly9ndGZ0YXNrLmJ5dGVkYW5jZS5jb20vYXBpL3YxL2FsZ29yaXRobS9vY3I=")
req, err := http.NewRequest("POST", string(url), bodyBuf)
if err != nil {
return nil, fmt.Errorf("construct request error: %v", err)

2
hrp/internal/version/VERSION
View File

@@ -1 +1 @@
v4.3.0-beta-10081235
v4.3.0-beta-10101409

7
hrp/session.go
View File

@@ -5,7 +5,6 @@ import (
"time"
"github.com/gorilla/websocket"
"github.com/pkg/errors"
"github.com/rs/zerolog/log"
)
@@ -162,8 +161,8 @@ func (r *SessionRunner) GetSummary() (*TestCaseSummary, error) {
caseSummary.InOut.ExportVars = exportVars
caseSummary.InOut.ConfigVars = r.parsedConfig.Variables
// add WDA/UIA logs to summary
for uuid, client := range r.hrpRunner.uiClients {
// add WDA/UIA logs to summary
log, err := client.Driver.StopCaptureLog()
if err != nil {
return caseSummary, err
@@ -172,6 +171,10 @@ func (r *SessionRunner) GetSummary() (*TestCaseSummary, error) {
"uuid": uuid,
"content": log,
}
// stop performance monitor
logs["performance"] = client.GetPerfData()
caseSummary.Logs = append(caseSummary.Logs, logs)
}

21
hrp/step.go
View File

@@ -1,6 +1,10 @@
package hrp
import "github.com/httprunner/httprunner/v4/hrp/internal/uixt"
import (
giDevice "github.com/electricbubble/gidevice"
"github.com/httprunner/httprunner/v4/hrp/internal/uixt"
)
type StepType string
@@ -24,6 +28,21 @@ var (
WithIgnoreNotFoundError = uixt.WithIgnoreNotFoundError
)
var (
WithPerfSystemCPU = giDevice.WithPerfSystemCPU
WithPerfSystemMem = giDevice.WithPerfSystemMem
WithPerfSystemDisk = giDevice.WithPerfSystemDisk
WithPerfSystemNetwork = giDevice.WithPerfSystemNetwork
WithPerfGPU = giDevice.WithPerfGPU
WithPerfFPS = giDevice.WithPerfFPS
WithPerfNetwork = giDevice.WithPerfNetwork
WithPerfBundleID = giDevice.WithPerfBundleID
WithPerfPID = giDevice.WithPerfPID
WithPerfOutputInterval = giDevice.WithPerfOutputInterval
WithPerfProcessAttributes = giDevice.WithPerfProcessAttributes
WithPerfSystemAttributes = giDevice.WithPerfSystemAttributes
)
type StepResult struct {
Name string `json:"name" yaml:"name"` // step name
StepType StepType `json:"step_type" yaml:"step_type"` // step type, testcase/request/transaction/rendezvous

1
hrp/step_ios_ui.go
View File

@@ -15,6 +15,7 @@ var (
WithWDAPort = uixt.WithWDAPort
WithWDAMjpegPort = uixt.WithWDAMjpegPort
WithLogOn = uixt.WithLogOn
WithPerfOptions = uixt.WithPerfOptions
)
type IOSStep struct {

2
httprunner/__init__.py
View File

@@ -1,4 +1,4 @@
__version__ = "v4.3.0-beta-10081235"
__version__ = "v4.3.0-beta-10101409"
__description__ = "One-stop solution for HTTP(S) testing."

2
pyproject.toml
View File

@@ -1,6 +1,6 @@
[tool.poetry]
name = "httprunner"
version = "v4.3.0-beta-10081235"
version = "v4.3.0-beta-10101409"
description = "One-stop solution for HTTP(S) testing."
license = "Apache-2.0"
readme = "README.md"