mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-25 02:10:24 +08:00
refactor: move Call function
This commit is contained in:
@@ -8,7 +8,6 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
||||
@@ -134,23 +133,6 @@ func TestDriver_ADB_TapXY(t *testing.T) {
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
func TestDriver_ADB_TapXY_WithHook(t *testing.T) {
|
||||
driver := setupADBDriverExt(t)
|
||||
|
||||
err := driver.Call("pre hook", func() {
|
||||
log.Info().Msg("pre hook")
|
||||
}, option.WithTimeout(1))
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = driver.TapXY(0.4, 0.5)
|
||||
assert.Nil(t, err)
|
||||
|
||||
err = driver.Call("post hook", func() {
|
||||
log.Info().Msg("post hook")
|
||||
}, option.WithTimeout(1))
|
||||
assert.Nil(t, err)
|
||||
}
|
||||
|
||||
func TestDriver_ADB_TapAbsXY(t *testing.T) {
|
||||
driver := setupADBDriverExt(t)
|
||||
err := driver.TapAbsXY(100, 300)
|
||||
|
||||
@@ -13,39 +13,6 @@ import (
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
// Call custom function, used for pre/post action hook
|
||||
func (dExt *XTDriver) Call(desc string, fn func(), opts ...option.ActionOption) error {
|
||||
actionOptions := option.NewActionOptions(opts...)
|
||||
|
||||
startTime := time.Now()
|
||||
defer func() {
|
||||
log.Info().Str("desc", desc).
|
||||
Int64("duration(ms)", time.Since(startTime).Milliseconds()).
|
||||
Msg("function called")
|
||||
}()
|
||||
|
||||
if actionOptions.Timeout == 0 {
|
||||
// wait for function to finish
|
||||
fn()
|
||||
return nil
|
||||
}
|
||||
|
||||
// set timeout for function execution
|
||||
done := make(chan struct{})
|
||||
go func() {
|
||||
defer close(done)
|
||||
fn()
|
||||
}()
|
||||
|
||||
select {
|
||||
case <-done:
|
||||
// function completed within timeout
|
||||
return nil
|
||||
case <-time.After(time.Duration(actionOptions.Timeout) * time.Second):
|
||||
return fmt.Errorf("function execution exceeded timeout of %d seconds", actionOptions.Timeout)
|
||||
}
|
||||
}
|
||||
|
||||
func preHandler_TapAbsXY(driver IDriver, options *option.ActionOptions, rawX, rawY float64) (
|
||||
x, y float64, err error) {
|
||||
|
||||
|
||||
Reference in New Issue
Block a user