mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-12 02:21:29 +08:00
feat: 优化driver teardown
This commit is contained in:
@@ -59,7 +59,7 @@ func (r *Router) clearAppHandler(c *gin.Context) {
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
err = driver.GetIDriver().(*uixt.ADBDriver).AppClear(appClearReq.PackageName)
|
||||
err = driver.GetIDriver().AppClear(appClearReq.PackageName)
|
||||
if err != nil {
|
||||
RenderError(c, err)
|
||||
return
|
||||
|
||||
@@ -37,8 +37,8 @@ func (p RouterBaseMethodExt) GetDriver(c *gin.Context) (driverExt uixt.IXTDriver
|
||||
server.RenderErrorInitDriver(c, err)
|
||||
return
|
||||
}
|
||||
c.Set("driver", driver)
|
||||
driverExt = driver_ext.NewXTDriver(driver,
|
||||
ai.WithCVService(ai.CVServiceTypeVEDEM))
|
||||
c.Set("driver", driverExt)
|
||||
return driverExt, nil
|
||||
}
|
||||
|
||||
@@ -32,7 +32,7 @@ type IRouterBaseMethod interface {
|
||||
}
|
||||
|
||||
func (r *Router) Init() {
|
||||
r.Engine.Use(teardown())
|
||||
r.Engine.Use(r.teardown())
|
||||
r.Engine.GET("/ping", r.pingHandler)
|
||||
r.Engine.GET("/", r.pingHandler)
|
||||
r.Engine.POST("/", r.pingHandler)
|
||||
@@ -91,7 +91,7 @@ func (r *Router) pingHandler(c *gin.Context) {
|
||||
RenderSuccess(c, true)
|
||||
}
|
||||
|
||||
func teardown() gin.HandlerFunc {
|
||||
func (r *Router) teardown() gin.HandlerFunc {
|
||||
return func(c *gin.Context) {
|
||||
logID := c.Request.Header.Get("x-tt-logid")
|
||||
startTime := time.Now()
|
||||
@@ -107,7 +107,7 @@ func teardown() gin.HandlerFunc {
|
||||
|
||||
driverObj, exists := c.Get("driver")
|
||||
if exists {
|
||||
if driver, ok := driverObj.(*uixt.XTDriver); ok {
|
||||
if driver, ok := driverObj.(uixt.IXTDriver); ok {
|
||||
_ = driver.TearDown()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user