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

feat: 优化ext getDriver和GetDevice策略

Browse Source
This commit is contained in:
余泓铮
2025-02-25 17:53:11 +08:00
parent ebdd676e61
commit 1094d1d95e
5 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/app.go
View File

@@ -25,7 +25,7 @@ func (r *Router) appInfoHandler(c *gin.Context) {
RenderErrorValidateRequest(c, err)
return
}
device, err := GetDevice(c)
device, err := r.GetDevice(c)
if err != nil {
return
}

10
server/context.go
View File

@@ -19,7 +19,7 @@ func (p RouterBaseMethod) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, e
var device uixt.IDevice
var driver uixt.IDriver
if !exists {
device, err = GetDevice(c)
device, err = p.GetDevice(c)
if err != nil {
return nil, err
}
@@ -39,7 +39,7 @@ func (p RouterBaseMethod) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver, e
return driverExt, nil
}
func GetDevice(c *gin.Context) (device uixt.IDevice, err error) {
func (p RouterBaseMethod) GetDevice(c *gin.Context) (device uixt.IDevice, err error) {
platform := c.Param("platform")
serial := c.Param("serial")
if serial == "" {
@@ -96,7 +96,7 @@ func RenderError(c *gin.Context, err error) {
c.JSON(http.StatusInternalServerError,
HttpResponse{
Code: code.GetErrorCode(err),
Message: err.Error(),
Message: "grey " + err.Error(),
},
)
c.Abort()
@@ -111,7 +111,7 @@ func RenderErrorInitDriver(c *gin.Context, err error) {
c.JSON(http.StatusInternalServerError,
HttpResponse{
Code: errCode,
Message: "init driver failed",
Message: "grey init driver failed",
},
)
c.Abort()
@@ -121,7 +121,7 @@ func RenderErrorValidateRequest(c *gin.Context, err error) {
log.Error().Err(err).Msg("validate request failed")
c.JSON(http.StatusBadRequest, HttpResponse{
Code: code.GetErrorCode(code.InvalidParamError),
Message: fmt.Sprintf("validate request param failed: %s", err.Error()),
Message: fmt.Sprintf("grey validate request param failed: %s", err.Error()),
})
c.Abort()
}

7
server/ext/context.go
View File

@@ -1,9 +1,8 @@
package server_ext
import (
"strings"
"github.com/gin-gonic/gin"
"strings"
"github.com/httprunner/httprunner/v5/pkg/uixt"
"github.com/httprunner/httprunner/v5/pkg/uixt/ai"
@@ -16,9 +15,9 @@ func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver
serial := c.Param("serial")
deviceObj, exists := c.Get("device")
var device uixt.IDevice
var driver uixt.IDriver
var driver driver_ext.IStubDriver
if !exists {
device, err = server.GetDevice(c)
device, err = p.GetDevice(c)
if err != nil {
return nil, err
}

1
server/main.go
View File

@@ -29,6 +29,7 @@ type RouterBaseMethod struct {
type IRouterBaseMethod interface {
GetDriver(c *gin.Context) (driver uixt.IXTDriver, err error)
GetDevice(c *gin.Context) (driver uixt.IDevice, err error)
}
func (r *Router) Init() {