mirror of
https://github.com/httprunner/httprunner.git
synced 2026-09-05 15:37:35 +08:00
Merge branch 'main' into chore/support-rich-interface-request-result-verification-mechanism
This commit is contained in:
@@ -3,6 +3,7 @@ package hrp
|
|||||||
import (
|
import (
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/jinzhu/copier"
|
||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
|
|
||||||
"github.com/httprunner/hrp/internal/boomer"
|
"github.com/httprunner/hrp/internal/boomer"
|
||||||
@@ -46,33 +47,43 @@ func (b *hrpBoomer) Run(testcases ...ITestCase) {
|
|||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
cfg := testcase.Config.ToStruct()
|
cfg := testcase.Config.ToStruct()
|
||||||
parameters := getParameters(testcase.Config)
|
err = initParameterIterator(cfg, "boomer")
|
||||||
if parameters == nil {
|
if err != nil {
|
||||||
parameters = []map[string]interface{}{{}}
|
panic(err)
|
||||||
}
|
|
||||||
for _, parameter := range parameters {
|
|
||||||
cfg.Variables = mergeVariables(parameter, cfg.Variables)
|
|
||||||
task := b.convertBoomerTask(testcase)
|
|
||||||
taskSlice = append(taskSlice, task)
|
|
||||||
}
|
}
|
||||||
|
task := b.convertBoomerTask(testcase)
|
||||||
|
taskSlice = append(taskSlice, task)
|
||||||
}
|
}
|
||||||
b.Boomer.Run(taskSlice...)
|
b.Boomer.Run(taskSlice...)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
|
func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
|
||||||
|
hrpRunner := NewRunner(nil).SetDebug(b.debug)
|
||||||
config := testcase.Config.ToStruct()
|
config := testcase.Config.ToStruct()
|
||||||
return &boomer.Task{
|
return &boomer.Task{
|
||||||
Name: config.Name,
|
Name: config.Name,
|
||||||
Weight: config.Weight,
|
Weight: config.Weight,
|
||||||
Fn: func() {
|
Fn: func() {
|
||||||
runner := NewRunner(nil).SetDebug(b.debug).Reset()
|
runner := hrpRunner.newCaseRunner(testcase)
|
||||||
|
|
||||||
testcaseSuccess := true // flag whole testcase result
|
testcaseSuccess := true // flag whole testcase result
|
||||||
var transactionSuccess = true // flag current transaction result
|
var transactionSuccess = true // flag current transaction result
|
||||||
|
|
||||||
|
cfg := testcase.Config.ToStruct()
|
||||||
|
caseConfig := &TConfig{}
|
||||||
|
// copy config to avoid data racing
|
||||||
|
if err := copier.Copy(caseConfig, cfg); err != nil {
|
||||||
|
log.Error().Err(err).Msg("copy config data failed")
|
||||||
|
}
|
||||||
|
// iterate through all parameter iterators and update case variables
|
||||||
|
for _, it := range caseConfig.ParametersSetting.Iterators {
|
||||||
|
if it.HasNext() {
|
||||||
|
caseConfig.Variables = mergeVariables(it.Next(), caseConfig.Variables)
|
||||||
|
}
|
||||||
|
}
|
||||||
startTime := time.Now()
|
startTime := time.Now()
|
||||||
for _, step := range testcase.TestSteps {
|
for index, step := range testcase.TestSteps {
|
||||||
stepData, err := runner.runStep(step, testcase.Config)
|
stepData, err := runner.runStep(index, caseConfig)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
// step failed
|
// step failed
|
||||||
var elapsed int64
|
var elapsed int64
|
||||||
@@ -85,8 +96,8 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
|
|||||||
testcaseSuccess = false
|
testcaseSuccess = false
|
||||||
transactionSuccess = false
|
transactionSuccess = false
|
||||||
|
|
||||||
if runner.failfast {
|
if runner.hrpRunner.failfast {
|
||||||
log.Error().Err(err).Msg("abort running due to failfast setting")
|
log.Error().Msg("abort running due to failfast setting")
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
log.Warn().Err(err).Msg("run step failed, continue next step")
|
log.Warn().Err(err).Msg("run step failed, continue next step")
|
||||||
@@ -115,7 +126,7 @@ func (b *hrpBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
|
|||||||
for name, transaction := range runner.transactions {
|
for name, transaction := range runner.transactions {
|
||||||
if len(transaction) == 1 {
|
if len(transaction) == 1 {
|
||||||
// if transaction end time not exists, use testcase end time instead
|
// if transaction end time not exists, use testcase end time instead
|
||||||
duration := endTime.Sub(transaction[TransactionStart])
|
duration := endTime.Sub(transaction[transactionStart])
|
||||||
b.RecordTransaction(name, transactionSuccess, duration.Milliseconds(), 0)
|
b.RecordTransaction(name, transactionSuccess, duration.Milliseconds(), 0)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+3
-2
@@ -4,10 +4,11 @@ import (
|
|||||||
"bytes"
|
"bytes"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"github.com/rs/zerolog/log"
|
|
||||||
"gopkg.in/yaml.v3"
|
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
"gopkg.in/yaml.v3"
|
||||||
)
|
)
|
||||||
|
|
||||||
func (tc *TCase) Dump2JSON(path string) error {
|
func (tc *TCase) Dump2JSON(path string) error {
|
||||||
|
|||||||
+9
-5
@@ -1,15 +1,19 @@
|
|||||||
# Release History
|
# Release History
|
||||||
|
|
||||||
## v0.3.0 (2021-12-22)
|
## v0.3.1 (2021-12-30)
|
||||||
|
|
||||||
|
- feat: set ulimit to 10240 before load testing
|
||||||
|
- fix: concurrent map writes in load testing
|
||||||
|
|
||||||
|
## v0.3.0 (2021-12-24)
|
||||||
|
|
||||||
- feat: implement `transaction` mechanism for load test
|
- feat: implement `transaction` mechanism for load test
|
||||||
- feat: continue running next step when failure occurs with `--continue-on-failure` flag, default to failfast
|
- feat: continue running next step when failure occurs with `--continue-on-failure` flag, default to failfast
|
||||||
- feat: spawn workers with `--spawn-rate` flag
|
|
||||||
- refactor: fork [boomer] as sub module
|
|
||||||
- feat: report GA events with version
|
- feat: report GA events with version
|
||||||
- feat: run load test with the given limit and burst as rate limiter
|
- feat: run load test with the given limit and burst as rate limiter, use `--spawn-count`, `--spawn-rate` and `--request-increase-rate` flag
|
||||||
|
- feat: report runner state to prometheus
|
||||||
|
- refactor: fork [boomer] as submodule initially and made a lot of changes
|
||||||
- change: update API models
|
- change: update API models
|
||||||
- feat: report runner state
|
|
||||||
|
|
||||||
## v0.2.2 (2021-12-07)
|
## v0.2.2 (2021-12-07)
|
||||||
|
|
||||||
|
|||||||
+12
-2
@@ -4,9 +4,19 @@ One-stop solution for HTTP(S) testing.
|
|||||||
|
|
||||||
### Synopsis
|
### Synopsis
|
||||||
|
|
||||||
hrp (HttpRunner+) aims to be a one-stop solution for HTTP(S) testing, covering API testing, load testing and digital experience monitoring (DEM). Enjoy! ✨ 🚀 ✨
|
|
||||||
|
██╗ ██╗████████╗████████╗██████╗ ██████╗ ██╗ ██╗███╗ ██╗███╗ ██╗███████╗██████╗
|
||||||
|
██║ ██║╚══██╔══╝╚══██╔══╝██╔══██╗██╔══██╗██║ ██║████╗ ██║████╗ ██║██╔════╝██╔══██╗
|
||||||
|
███████║ ██║ ██║ ██████╔╝██████╔╝██║ ██║██╔██╗ ██║██╔██╗ ██║█████╗ ██████╔╝
|
||||||
|
██╔══██║ ██║ ██║ ██╔═══╝ ██╔══██╗██║ ██║██║╚██╗██║██║╚██╗██║██╔══╝ ██╔══██╗
|
||||||
|
██║ ██║ ██║ ██║ ██║ ██║ ██║╚██████╔╝██║ ╚████║██║ ╚████║███████╗██║ ██║
|
||||||
|
╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝ ╚═══╝╚══════╝╚═╝ ╚═╝
|
||||||
|
|
||||||
|
hrp (HttpRunner+) aims to be a one-stop solution for HTTP(S) testing, covering API testing,
|
||||||
|
load testing and digital experience monitoring (DEM). Enjoy! ✨ 🚀 ✨
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
|
Website: https://httprunner.com
|
||||||
Github: https://github.com/httprunner/hrp
|
Github: https://github.com/httprunner/hrp
|
||||||
Copyright 2021 debugtalk
|
Copyright 2021 debugtalk
|
||||||
|
|
||||||
@@ -22,4 +32,4 @@ Copyright 2021 debugtalk
|
|||||||
* [hrp har2case](hrp_har2case.md) - Convert HAR to json/yaml testcase files
|
* [hrp har2case](hrp_har2case.md) - Convert HAR to json/yaml testcase files
|
||||||
* [hrp run](hrp_run.md) - run API test
|
* [hrp run](hrp_run.md) - run API test
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 24-Dec-2021
|
###### Auto generated by spf13/cobra on 30-Dec-2021
|
||||||
|
|||||||
@@ -38,4 +38,4 @@ hrp boom [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 24-Dec-2021
|
###### Auto generated by spf13/cobra on 30-Dec-2021
|
||||||
|
|||||||
@@ -23,4 +23,4 @@ hrp har2case harPath... [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 24-Dec-2021
|
###### Auto generated by spf13/cobra on 30-Dec-2021
|
||||||
|
|||||||
+1
-1
@@ -31,4 +31,4 @@ hrp run path... [flags]
|
|||||||
|
|
||||||
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
* [hrp](hrp.md) - One-stop solution for HTTP(S) testing.
|
||||||
|
|
||||||
###### Auto generated by spf13/cobra on 24-Dec-2021
|
###### Auto generated by spf13/cobra on 30-Dec-2021
|
||||||
|
|||||||
@@ -6,14 +6,18 @@
|
|||||||
"iOS/10.1",
|
"iOS/10.1",
|
||||||
"iOS/10.2"
|
"iOS/10.2"
|
||||||
],
|
],
|
||||||
"username-password": "${parameterize(examples/account.csv)}",
|
"username-password": "${parameterize(examples/account.csv)}"
|
||||||
"app_version": "${getAppVersion()}"
|
|
||||||
},
|
},
|
||||||
"parameters_setting": {
|
"parameters_setting": {
|
||||||
"strategy": "random"
|
"strategy": {
|
||||||
|
"user_agent": "sequential",
|
||||||
|
"username-password": "random"
|
||||||
|
},
|
||||||
|
"iteration": 6
|
||||||
},
|
},
|
||||||
"variables": {
|
"variables": {
|
||||||
"app_version": "f1"
|
"app_version": "v1",
|
||||||
|
"user_agent": "iOS/10.3"
|
||||||
},
|
},
|
||||||
"base_url": "https://postman-echo.com",
|
"base_url": "https://postman-echo.com",
|
||||||
"verify": false
|
"verify": false
|
||||||
@@ -24,7 +28,7 @@
|
|||||||
"variables": {
|
"variables": {
|
||||||
"foo1": "$username",
|
"foo1": "$username",
|
||||||
"foo2": "$password",
|
"foo2": "$password",
|
||||||
"foo3": "$app_version"
|
"foo3": "$user_agent"
|
||||||
},
|
},
|
||||||
"request": {
|
"request": {
|
||||||
"method": "GET",
|
"method": "GET",
|
||||||
@@ -48,7 +52,7 @@
|
|||||||
{
|
{
|
||||||
"check": "body.args.foo3",
|
"check": "body.args.foo3",
|
||||||
"assert": "not_equal",
|
"assert": "not_equal",
|
||||||
"expect": "f1",
|
"expect": "iOS/10.3",
|
||||||
"msg": "check app version"
|
"msg": "check app version"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -1,38 +1,40 @@
|
|||||||
config:
|
config:
|
||||||
name: "request methods testcase: validate with parameters"
|
name: "request methods testcase: validate with parameters"
|
||||||
parameters:
|
parameters:
|
||||||
user_agent: ["iOS/10.1", "iOS/10.2"]
|
user_agent: [ "iOS/10.1", "iOS/10.2" ]
|
||||||
username-password: ${parameterize(examples/account.csv)}
|
username-password: ${parameterize(examples/account.csv)}
|
||||||
app_version: ${getAppVersion()}
|
parameters_setting:
|
||||||
parameters_setting:
|
strategy:
|
||||||
strategy: random
|
user_agent: "sequential"
|
||||||
variables:
|
username-password: "random"
|
||||||
app_version: f1
|
iteration: 6
|
||||||
base_url: "https://postman-echo.com"
|
variables:
|
||||||
verify: False
|
app_version: v1
|
||||||
|
user_agent: iOS/10.3
|
||||||
|
base_url: "https://postman-echo.com"
|
||||||
|
verify: False
|
||||||
|
|
||||||
teststeps:
|
teststeps:
|
||||||
-
|
- name: get with params
|
||||||
name: get with params
|
|
||||||
variables:
|
variables:
|
||||||
foo1: $username
|
foo1: $username
|
||||||
foo2: $password
|
foo2: $password
|
||||||
foo3: $app_version
|
foo3: $user_agent
|
||||||
request:
|
request:
|
||||||
method: GET
|
method: GET
|
||||||
url: /get
|
url: /get
|
||||||
params:
|
params:
|
||||||
foo1: $foo1
|
foo1: $foo1
|
||||||
foo2: $foo2
|
foo2: $foo2
|
||||||
foo3: $foo3
|
foo3: $foo3
|
||||||
headers:
|
headers:
|
||||||
User-Agent: $user_agent,$app_version
|
User-Agent: $user_agent,$app_version
|
||||||
validate:
|
validate:
|
||||||
- check: status_code
|
- check: status_code
|
||||||
assert: equals
|
assert: equals
|
||||||
expect: 200
|
expect: 200
|
||||||
msg: check status code
|
msg: check status code
|
||||||
- check: body.args.foo3
|
- check: body.args.foo3
|
||||||
assert: not_equal
|
assert: not_equal
|
||||||
expect: f1
|
expect: iOS/10.3
|
||||||
msg: check app version
|
msg: check app version
|
||||||
+2
-1
@@ -19,7 +19,8 @@ var boomCmd = &cobra.Command{
|
|||||||
$ hrp boom examples/ # run testcases in specified folder`,
|
$ hrp boom examples/ # run testcases in specified folder`,
|
||||||
Args: cobra.MinimumNArgs(1),
|
Args: cobra.MinimumNArgs(1),
|
||||||
PreRun: func(cmd *cobra.Command, args []string) {
|
PreRun: func(cmd *cobra.Command, args []string) {
|
||||||
setLogLevel("WARN") // disable info logs for load testing
|
boomer.SetUlimit(10240) // ulimit -n 10240
|
||||||
|
setLogLevel("WARN") // disable info logs for load testing
|
||||||
},
|
},
|
||||||
Run: func(cmd *cobra.Command, args []string) {
|
Run: func(cmd *cobra.Command, args []string) {
|
||||||
var paths []hrp.ITestCase
|
var paths []hrp.ITestCase
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ import (
|
|||||||
"github.com/rs/zerolog/log"
|
"github.com/rs/zerolog/log"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
|
|
||||||
"github.com/httprunner/hrp/har2case"
|
"github.com/httprunner/hrp/internal/har2case"
|
||||||
)
|
)
|
||||||
|
|
||||||
// har2caseCmd represents the har2case command
|
// har2caseCmd represents the har2case command
|
||||||
|
|||||||
+11
-1
@@ -15,9 +15,19 @@ import (
|
|||||||
var RootCmd = &cobra.Command{
|
var RootCmd = &cobra.Command{
|
||||||
Use: "hrp",
|
Use: "hrp",
|
||||||
Short: "One-stop solution for HTTP(S) testing.",
|
Short: "One-stop solution for HTTP(S) testing.",
|
||||||
Long: `hrp (HttpRunner+) aims to be a one-stop solution for HTTP(S) testing, covering API testing, load testing and digital experience monitoring (DEM). Enjoy! ✨ 🚀 ✨
|
Long: `
|
||||||
|
██╗ ██╗████████╗████████╗██████╗ ██████╗ ██╗ ██╗███╗ ██╗███╗ ██╗███████╗██████╗
|
||||||
|
██║ ██║╚══██╔══╝╚══██╔══╝██╔══██╗██╔══██╗██║ ██║████╗ ██║████╗ ██║██╔════╝██╔══██╗
|
||||||
|
███████║ ██║ ██║ ██████╔╝██████╔╝██║ ██║██╔██╗ ██║██╔██╗ ██║█████╗ ██████╔╝
|
||||||
|
██╔══██║ ██║ ██║ ██╔═══╝ ██╔══██╗██║ ██║██║╚██╗██║██║╚██╗██║██╔══╝ ██╔══██╗
|
||||||
|
██║ ██║ ██║ ██║ ██║ ██║ ██║╚██████╔╝██║ ╚████║██║ ╚████║███████╗██║ ██║
|
||||||
|
╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ╚═══╝╚═╝ ╚═══╝╚══════╝╚═╝ ╚═╝
|
||||||
|
|
||||||
|
hrp (HttpRunner+) aims to be a one-stop solution for HTTP(S) testing, covering API testing,
|
||||||
|
load testing and digital experience monitoring (DEM). Enjoy! ✨ 🚀 ✨
|
||||||
|
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
|
Website: https://httprunner.com
|
||||||
Github: https://github.com/httprunner/hrp
|
Github: https://github.com/httprunner/hrp
|
||||||
Copyright 2021 debugtalk`,
|
Copyright 2021 debugtalk`,
|
||||||
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
PersistentPreRun: func(cmd *cobra.Command, args []string) {
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
// +build !windows
|
||||||
|
|
||||||
|
package boomer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"syscall"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
// set resource limit
|
||||||
|
// ulimit -n 10240
|
||||||
|
func SetUlimit(limit uint64) {
|
||||||
|
var rLimit syscall.Rlimit
|
||||||
|
err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msg("get ulimit failed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
log.Info().Uint64("limit", rLimit.Cur).Msg("get current ulimit")
|
||||||
|
if rLimit.Cur >= limit {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
rLimit.Cur = limit
|
||||||
|
log.Info().Uint64("limit", rLimit.Cur).Msg("set current ulimit")
|
||||||
|
err = syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit)
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Err(err).Msg("set ulimit failed")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
// +build windows
|
||||||
|
|
||||||
|
package boomer
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
|
)
|
||||||
|
|
||||||
|
// set resource limit
|
||||||
|
func SetUlimit(limit uint64) {
|
||||||
|
log.Warn().Msg("windows does not support setting ulimit")
|
||||||
|
}
|
||||||
@@ -4,13 +4,14 @@ import (
|
|||||||
"crypto/md5"
|
"crypto/md5"
|
||||||
"encoding/csv"
|
"encoding/csv"
|
||||||
"encoding/hex"
|
"encoding/hex"
|
||||||
"github.com/rs/zerolog/log"
|
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"math"
|
"math"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/rs/zerolog/log"
|
||||||
)
|
)
|
||||||
|
|
||||||
var Functions = map[string]interface{}{
|
var Functions = map[string]interface{}{
|
||||||
@@ -19,8 +20,8 @@ var Functions = map[string]interface{}{
|
|||||||
"gen_random_string": genRandomString, // call with one argument
|
"gen_random_string": genRandomString, // call with one argument
|
||||||
"max": math.Max, // call with two arguments
|
"max": math.Max, // call with two arguments
|
||||||
"md5": MD5,
|
"md5": MD5,
|
||||||
"parameterize": LoadFromCSV,
|
"parameterize": loadFromCSV,
|
||||||
"P": LoadFromCSV,
|
"P": loadFromCSV,
|
||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
@@ -52,7 +53,7 @@ func MD5(str string) string {
|
|||||||
return hex.EncodeToString(hasher.Sum(nil))
|
return hex.EncodeToString(hasher.Sum(nil))
|
||||||
}
|
}
|
||||||
|
|
||||||
func LoadFromCSV(path string) []map[string]string {
|
func loadFromCSV(path string) []map[string]interface{} {
|
||||||
path, err := filepath.Abs(path)
|
path, err := filepath.Abs(path)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Str("path", path).Err(err).Msg("convert absolute path failed")
|
log.Error().Str("path", path).Err(err).Msg("convert absolute path failed")
|
||||||
@@ -71,9 +72,9 @@ func LoadFromCSV(path string) []map[string]string {
|
|||||||
log.Error().Err(err).Msg("parse csv file failed")
|
log.Error().Err(err).Msg("parse csv file failed")
|
||||||
panic(err)
|
panic(err)
|
||||||
}
|
}
|
||||||
var result []map[string]string
|
var result []map[string]interface{}
|
||||||
for i := 1; i < len(content); i++ {
|
for i := 1; i < len(content); i++ {
|
||||||
row := make(map[string]string)
|
row := make(map[string]interface{})
|
||||||
for j := 0; j < len(content[i]); j++ {
|
for j := 0; j < len(content[i]); j++ {
|
||||||
row[content[0][j]] = content[i][j]
|
row[content[0][j]] = content[i][j]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
harPath = "../examples/har/demo.har"
|
harPath = "../../examples/har/demo.har"
|
||||||
harPath2 = "../examples/har/postman-echo.har"
|
harPath2 = "../../examples/har/postman-echo.har"
|
||||||
)
|
)
|
||||||
|
|
||||||
func TestGenJSON(t *testing.T) {
|
func TestGenJSON(t *testing.T) {
|
||||||
@@ -1,3 +1,3 @@
|
|||||||
package version
|
package version
|
||||||
|
|
||||||
const VERSION = "v0.3.0"
|
const VERSION = "v0.4.0"
|
||||||
|
|||||||
@@ -1,5 +1,11 @@
|
|||||||
package hrp
|
package hrp
|
||||||
|
|
||||||
|
import (
|
||||||
|
"math/rand"
|
||||||
|
"sync"
|
||||||
|
"time"
|
||||||
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
httpGET string = "GET"
|
httpGET string = "GET"
|
||||||
httpHEAD string = "HEAD"
|
httpHEAD string = "HEAD"
|
||||||
@@ -18,11 +24,65 @@ type TConfig struct {
|
|||||||
BaseURL string `json:"base_url,omitempty" yaml:"base_url,omitempty"`
|
BaseURL string `json:"base_url,omitempty" yaml:"base_url,omitempty"`
|
||||||
Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"`
|
Variables map[string]interface{} `json:"variables,omitempty" yaml:"variables,omitempty"`
|
||||||
Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"`
|
Parameters map[string]interface{} `json:"parameters,omitempty" yaml:"parameters,omitempty"`
|
||||||
ParametersSetting map[string]interface{} `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"`
|
ParametersSetting *TParamsConfig `json:"parameters_setting,omitempty" yaml:"parameters_setting,omitempty"`
|
||||||
Export []string `json:"export,omitempty" yaml:"export,omitempty"`
|
Export []string `json:"export,omitempty" yaml:"export,omitempty"`
|
||||||
Weight int `json:"weight,omitempty" yaml:"weight,omitempty"`
|
Weight int `json:"weight,omitempty" yaml:"weight,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
type TParamsConfig struct {
|
||||||
|
Strategy interface{} `json:"strategy,omitempty" yaml:"strategy,omitempty"`
|
||||||
|
Iteration int `json:"iteration,omitempty" yaml:"iteration,omitempty"`
|
||||||
|
Iterators []*Iterator `json:"parameterIterator,omitempty" yaml:"parameterIterator,omitempty"` //保存参数的迭代器
|
||||||
|
}
|
||||||
|
|
||||||
|
const (
|
||||||
|
strategyRandom string = "random"
|
||||||
|
strategySequential string = "Sequential"
|
||||||
|
)
|
||||||
|
|
||||||
|
type paramsType []map[string]interface{}
|
||||||
|
|
||||||
|
type Iterator struct {
|
||||||
|
sync.Mutex
|
||||||
|
data paramsType
|
||||||
|
strategy string // random, sequential
|
||||||
|
iteration int
|
||||||
|
index int
|
||||||
|
}
|
||||||
|
|
||||||
|
func (params paramsType) Iterator() *Iterator {
|
||||||
|
return &Iterator{
|
||||||
|
data: params,
|
||||||
|
iteration: len(params),
|
||||||
|
index: 0,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (iter *Iterator) HasNext() bool {
|
||||||
|
if iter.iteration == -1 {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
return iter.index < iter.iteration
|
||||||
|
}
|
||||||
|
|
||||||
|
func (iter *Iterator) Next() (value map[string]interface{}) {
|
||||||
|
iter.Lock()
|
||||||
|
defer iter.Unlock()
|
||||||
|
if len(iter.data) == 0 {
|
||||||
|
iter.index++
|
||||||
|
return map[string]interface{}{}
|
||||||
|
}
|
||||||
|
if iter.strategy == strategyRandom {
|
||||||
|
randSource := rand.New(rand.NewSource(time.Now().Unix()))
|
||||||
|
randIndex := randSource.Intn(len(iter.data))
|
||||||
|
value = iter.data[randIndex]
|
||||||
|
} else {
|
||||||
|
value = iter.data[iter.index%len(iter.data)]
|
||||||
|
}
|
||||||
|
iter.index++
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
|
||||||
// Request represents HTTP request data structure.
|
// Request represents HTTP request data structure.
|
||||||
// This is used for teststep.
|
// This is used for teststep.
|
||||||
type Request struct {
|
type Request struct {
|
||||||
@@ -70,16 +130,16 @@ const (
|
|||||||
stepTypeRendezvous stepType = "rendezvous"
|
stepTypeRendezvous stepType = "rendezvous"
|
||||||
)
|
)
|
||||||
|
|
||||||
type TransactionType string
|
type transactionType string
|
||||||
|
|
||||||
const (
|
const (
|
||||||
TransactionStart TransactionType = "start"
|
transactionStart transactionType = "start"
|
||||||
TransactionEnd TransactionType = "end"
|
transactionEnd transactionType = "end"
|
||||||
)
|
)
|
||||||
|
|
||||||
type Transaction struct {
|
type Transaction struct {
|
||||||
Name string `json:"name" yaml:"name"`
|
Name string `json:"name" yaml:"name"`
|
||||||
Type TransactionType `json:"type" yaml:"type"`
|
Type transactionType `json:"type" yaml:"type"`
|
||||||
}
|
}
|
||||||
type Rendezvous struct {
|
type Rendezvous struct {
|
||||||
Name string `json:"name" yaml:"name"` // required
|
Name string `json:"name" yaml:"name"` // required
|
||||||
|
|||||||
@@ -3,12 +3,10 @@ package hrp
|
|||||||
import (
|
import (
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"math/rand"
|
|
||||||
"net/url"
|
"net/url"
|
||||||
"reflect"
|
"reflect"
|
||||||
"regexp"
|
"regexp"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
|
||||||
|
|
||||||
"github.com/maja42/goval"
|
"github.com/maja42/goval"
|
||||||
"github.com/pkg/errors"
|
"github.com/pkg/errors"
|
||||||
@@ -496,27 +494,18 @@ func findallVariables(raw string) variableSet {
|
|||||||
return varSet
|
return varSet
|
||||||
}
|
}
|
||||||
|
|
||||||
func shuffleCartesianProduct(slice []map[string]interface{}) {
|
func genCartesianProduct(paramsMap map[string]paramsType) paramsType {
|
||||||
if slice == nil || len(slice) == 0 {
|
if len(paramsMap) == 0 {
|
||||||
return
|
|
||||||
}
|
|
||||||
r := rand.New(rand.NewSource(time.Now().Unix()))
|
|
||||||
for len(slice) > 0 {
|
|
||||||
n := len(slice)
|
|
||||||
randIndex := r.Intn(n)
|
|
||||||
slice[n-1], slice[randIndex] = slice[randIndex], slice[n-1]
|
|
||||||
slice = slice[:n-1]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func genCartesianProduct(params [][]map[string]interface{}) []map[string]interface{} {
|
|
||||||
if params == nil || len(params) == 0 {
|
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
var cartesianProduct []map[string]interface{}
|
var params []paramsType
|
||||||
|
for _, v := range paramsMap {
|
||||||
|
params = append(params, v)
|
||||||
|
}
|
||||||
|
var cartesianProduct paramsType
|
||||||
cartesianProduct = params[0]
|
cartesianProduct = params[0]
|
||||||
for i := 0; i < len(params)-1; i++ {
|
for i := 0; i < len(params)-1; i++ {
|
||||||
var tempProduct []map[string]interface{}
|
var tempProduct paramsType
|
||||||
for _, param1 := range cartesianProduct {
|
for _, param1 := range cartesianProduct {
|
||||||
for _, param2 := range params[i+1] {
|
for _, param2 := range params[i+1] {
|
||||||
tempProduct = append(tempProduct, mergeVariables(param1, param2))
|
tempProduct = append(tempProduct, mergeVariables(param1, param2))
|
||||||
@@ -527,103 +516,156 @@ func genCartesianProduct(params [][]map[string]interface{}) []map[string]interfa
|
|||||||
return cartesianProduct
|
return cartesianProduct
|
||||||
}
|
}
|
||||||
|
|
||||||
func getParameters(config IConfig) []map[string]interface{} {
|
func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) (map[string]paramsType, error) {
|
||||||
cfg := config.ToStruct()
|
if len(parameters) == 0 {
|
||||||
// parse config parameters
|
|
||||||
parsedParams, err := parseParameters(cfg.Parameters, cfg.Variables)
|
|
||||||
if err != nil {
|
|
||||||
log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed")
|
|
||||||
}
|
|
||||||
if cfg.ParametersSetting["strategy"] != nil && strings.ToLower(cfg.ParametersSetting["strategy"].(string)) == "random" {
|
|
||||||
shuffleCartesianProduct(parsedParams)
|
|
||||||
}
|
|
||||||
return parsedParams
|
|
||||||
}
|
|
||||||
|
|
||||||
func parseParameters(parameters map[string]interface{}, variablesMapping map[string]interface{}) ([]map[string]interface{}, error) {
|
|
||||||
if parameters == nil || len(parameters) == 0 {
|
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
var parsedParametersSlice [][]map[string]interface{}
|
parsedParametersSlice := make(map[string]paramsType)
|
||||||
|
var err error
|
||||||
for k, v := range parameters {
|
for k, v := range parameters {
|
||||||
parameterNameSlice := strings.Split(k, "-")
|
var parameterSlice paramsType
|
||||||
var parameterSlice []map[string]interface{}
|
|
||||||
rawValue := reflect.ValueOf(v)
|
rawValue := reflect.ValueOf(v)
|
||||||
switch rawValue.Kind() {
|
switch rawValue.Kind() {
|
||||||
case reflect.String:
|
case reflect.String:
|
||||||
parsedParameterContent, err := parseData(rawValue.Interface(), variablesMapping)
|
// e.g. username-password: ${parameterize(examples/account.csv)} -> [{"username": "test1", "password": "111111"}, {"username": "test2", "password": "222222"}]
|
||||||
|
var parsedParameterContent interface{}
|
||||||
|
parsedParameterContent, err = parseString(rawValue.String(), variablesMapping)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parse parameter error")
|
log.Error().Interface("parameterContent", rawValue).Msg("[parseParameters] parse parameter content error")
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
parsedParameterRawValue := reflect.ValueOf(parsedParameterContent)
|
parsedParameterRawValue := reflect.ValueOf(parsedParameterContent)
|
||||||
if parsedParameterRawValue.Kind() != reflect.Slice {
|
if parsedParameterRawValue.Kind() != reflect.Slice {
|
||||||
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parsed parameter content should be Slice, got %v")
|
log.Error().Interface("parameterContent", parsedParameterRawValue).Msg("[parseParameters] parsed parameter content should be slice")
|
||||||
return nil, errors.New("parsed parameter content should be Slice")
|
return nil, errors.New("parsed parameter content should be slice")
|
||||||
}
|
}
|
||||||
for i := 0; i < parsedParameterRawValue.Len(); i++ {
|
parameterSlice, err = parseSlice(k, parsedParameterRawValue.Interface())
|
||||||
parameterMap := make(map[string]interface{})
|
case reflect.Slice:
|
||||||
// e.g.
|
// e.g. user_agent: ["iOS/10.1", "iOS/10.2"] -> [{"user_agent": "iOS/10.1"}, {"user_agent": "iOS/10.2"}]
|
||||||
elem := reflect.ValueOf(parsedParameterRawValue.Index(i).Interface())
|
parameterSlice, err = parseSlice(k, rawValue.Interface())
|
||||||
if elem.Kind() == reflect.Map {
|
default:
|
||||||
// e.g. [{"username": "test1", "password": "passwd1", "other": "111"}, {"username": "test2", "password": "passwd2", "other": ""222}]
|
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be slice or text(functions call)")
|
||||||
// -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}] (username, password in parameterNameSlice)
|
return nil, errors.New("parameter content should be slice or text(functions call)")
|
||||||
for _, key := range parameterNameSlice {
|
}
|
||||||
if _, ok := elem.Interface().(map[string]string)[key]; ok {
|
if err != nil {
|
||||||
parameterMap[key] = elem.MapIndex(reflect.ValueOf(key)).Interface()
|
return nil, err
|
||||||
} else {
|
}
|
||||||
log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name not found")
|
parsedParametersSlice[k] = parameterSlice
|
||||||
return nil, errors.New("parameter name not found")
|
}
|
||||||
}
|
return parsedParametersSlice, nil
|
||||||
}
|
}
|
||||||
} else if elem.Kind() == reflect.Slice {
|
|
||||||
// e.g. [["test1", "passwd1"], ["test2", "passwd2"]] -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}]
|
func parseSlice(parameterName string, parameterContent interface{}) ([]map[string]interface{}, error) {
|
||||||
if len(parameterNameSlice) != elem.Len() {
|
parameterNameSlice := strings.Split(parameterName, "-")
|
||||||
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length")
|
var parameterSlice []map[string]interface{}
|
||||||
return nil, errors.New("parameter name Slice and parameter cjntent Slice should have the same length")
|
parameterContentSlice := reflect.ValueOf(parameterContent)
|
||||||
} else {
|
if parameterContentSlice.Kind() != reflect.Slice {
|
||||||
for j := 0; j < elem.Len(); j++ {
|
return nil, errors.New("parameterContent should be slice")
|
||||||
parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface()
|
}
|
||||||
}
|
for i := 0; i < parameterContentSlice.Len(); i++ {
|
||||||
}
|
parameterMap := make(map[string]interface{})
|
||||||
|
elem := reflect.ValueOf(parameterContentSlice.Index(i).Interface())
|
||||||
|
switch elem.Kind() {
|
||||||
|
case reflect.Map:
|
||||||
|
// e.g. "username-password": [{"username": "test1", "password": "passwd1", "other": "111"}, {"username": "test2", "password": "passwd2", "other": ""222}]
|
||||||
|
// -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}]
|
||||||
|
for _, key := range parameterNameSlice {
|
||||||
|
if _, ok := elem.Interface().(map[string]interface{})[key]; ok {
|
||||||
|
parameterMap[key] = elem.MapIndex(reflect.ValueOf(key)).Interface()
|
||||||
} else {
|
} else {
|
||||||
// e.g. ${getAppVersion()} -> [3.1, 3.0] -> [{"app_version": 3.1}, {"app_version": 3.0}]
|
log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name not found")
|
||||||
if len(parameterNameSlice) != 1 {
|
return nil, errors.New("parameter name not found")
|
||||||
log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string")
|
|
||||||
return nil, errors.New("parameter name slice should have only one element when parameter content is string")
|
|
||||||
}
|
|
||||||
parameterMap[parameterNameSlice[0]] = elem.Interface()
|
|
||||||
}
|
}
|
||||||
parameterSlice = append(parameterSlice, parameterMap)
|
|
||||||
}
|
}
|
||||||
case reflect.Slice:
|
case reflect.Slice:
|
||||||
for i := 0; i < rawValue.Len(); i++ {
|
// e.g. "username-password": [["test1", "passwd1"], ["test2", "passwd2"]]
|
||||||
parameterMap := make(map[string]interface{})
|
// -> [{"username": "test1", "password": "passwd1"}, {"username": "test2", "password": "passwd2"}]
|
||||||
elem := reflect.ValueOf(rawValue.Index(i).Interface())
|
if len(parameterNameSlice) != elem.Len() {
|
||||||
if elem.Kind() == reflect.Slice {
|
log.Error().Interface("parameterNameSlice", parameterNameSlice).Interface("parameterContent", elem.Interface()).Msg("[parseParameters] parameter name slice and parameter content slice should have the same length")
|
||||||
// e.g. username-password: [["test1", "passwd1"], ["test2", "passwd2"]]
|
return nil, errors.New("parameter name slice and parameter content slice should have the same length")
|
||||||
if len(parameterNameSlice) != elem.Len() {
|
} else {
|
||||||
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter name Slice and parameter content Slice should have the same length")
|
for j := 0; j < elem.Len(); j++ {
|
||||||
return nil, errors.New("parameter name Slice and parameter content Slice should have the same length")
|
parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface()
|
||||||
}
|
|
||||||
for j := 0; j < elem.Len(); j++ {
|
|
||||||
parameterMap[parameterNameSlice[j]] = elem.Index(j).Interface()
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// e.g. user_agent: ["iOS/10.1", "iOS/10.2"]
|
|
||||||
if len(parameterNameSlice) != 1 {
|
|
||||||
log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string")
|
|
||||||
return nil, errors.New("parameter name slice should have only one element when parameter content is string")
|
|
||||||
}
|
|
||||||
parameterMap[parameterNameSlice[0]] = elem.Interface()
|
|
||||||
}
|
}
|
||||||
parameterSlice = append(parameterSlice, parameterMap)
|
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
log.Error().Interface("parameter", parameters).Msg("[parseParameters] parameter content should be Slice or Text(variables or functions call)")
|
// e.g. "app_version": [3.1, 3.0]
|
||||||
return nil, errors.New("parameter content should be Slice or Text(variables or functions call)")
|
// -> [{"app_version": 3.1}, {"app_version": 3.0}]
|
||||||
|
if len(parameterNameSlice) != 1 {
|
||||||
|
log.Error().Interface("parameterNameSlice", parameterNameSlice).Msg("[parseParameters] parameter name slice should have only one element when parameter content is string")
|
||||||
|
return nil, errors.New("parameter name slice should have only one element when parameter content is string")
|
||||||
|
}
|
||||||
|
parameterMap[parameterNameSlice[0]] = elem.Interface()
|
||||||
}
|
}
|
||||||
parsedParametersSlice = append(parsedParametersSlice, parameterSlice)
|
parameterSlice = append(parameterSlice, parameterMap)
|
||||||
}
|
}
|
||||||
return genCartesianProduct(parsedParametersSlice), nil
|
return parameterSlice, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func initParameterIterator(cfg *TConfig, mode string) (err error) {
|
||||||
|
var parameters map[string]paramsType
|
||||||
|
parameters, err = parseParameters(cfg.Parameters, cfg.Variables)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// parse config parameters setting
|
||||||
|
if cfg.ParametersSetting == nil {
|
||||||
|
cfg.ParametersSetting = &TParamsConfig{Iterators: []*Iterator{}}
|
||||||
|
}
|
||||||
|
// boomer模式下不限制迭代次数
|
||||||
|
if mode == "boomer" {
|
||||||
|
cfg.ParametersSetting.Iteration = -1
|
||||||
|
}
|
||||||
|
rawValue := reflect.ValueOf(cfg.ParametersSetting.Strategy)
|
||||||
|
switch rawValue.Kind() {
|
||||||
|
case reflect.Map:
|
||||||
|
// strategy: {"user_agent": "sequential", "username-password": "random"}, 每个参数对应一个迭代器,每个迭代器随机、顺序选取元素互不影响
|
||||||
|
for k, v := range parameters {
|
||||||
|
if _, ok := rawValue.Interface().(map[string]interface{})[k]; ok {
|
||||||
|
// use strategy if configured
|
||||||
|
cfg.ParametersSetting.Iterators = append(
|
||||||
|
cfg.ParametersSetting.Iterators,
|
||||||
|
newIterator(v, rawValue.MapIndex(reflect.ValueOf(k)).Interface().(string), cfg.ParametersSetting.Iteration),
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
// use sequential strategy by default
|
||||||
|
cfg.ParametersSetting.Iterators = append(
|
||||||
|
cfg.ParametersSetting.Iterators,
|
||||||
|
newIterator(v, strategySequential, cfg.ParametersSetting.Iteration),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
case reflect.String:
|
||||||
|
// strategy: random, 仅生成一个的迭代器,该迭代器在参数笛卡尔积slice中随机选取元素
|
||||||
|
if len(rawValue.String()) == 0 {
|
||||||
|
cfg.ParametersSetting.Strategy = strategySequential
|
||||||
|
} else {
|
||||||
|
cfg.ParametersSetting.Strategy = strings.ToLower(rawValue.String())
|
||||||
|
}
|
||||||
|
cfg.ParametersSetting.Iterators = append(
|
||||||
|
cfg.ParametersSetting.Iterators,
|
||||||
|
newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration),
|
||||||
|
)
|
||||||
|
default:
|
||||||
|
// default strategy: sequential, 仅生成一个的迭代器,该迭代器在参数笛卡尔积slice中顺序选取元素
|
||||||
|
cfg.ParametersSetting.Strategy = strategySequential
|
||||||
|
cfg.ParametersSetting.Iterators = append(
|
||||||
|
cfg.ParametersSetting.Iterators,
|
||||||
|
newIterator(genCartesianProduct(parameters), cfg.ParametersSetting.Strategy.(string), cfg.ParametersSetting.Iteration),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func newIterator(parameters paramsType, strategy string, iteration int) *Iterator {
|
||||||
|
iter := parameters.Iterator()
|
||||||
|
iter.strategy = strategy
|
||||||
|
if iteration > 0 {
|
||||||
|
iter.iteration = iteration
|
||||||
|
} else if iteration < 0 {
|
||||||
|
iter.iteration = -1
|
||||||
|
} else if iter.iteration == 0 {
|
||||||
|
iter.iteration = 1
|
||||||
|
}
|
||||||
|
return iter
|
||||||
}
|
}
|
||||||
|
|||||||
+77
-20
@@ -621,44 +621,40 @@ func TestFindallVariables(t *testing.T) {
|
|||||||
|
|
||||||
func TestParseParameters(t *testing.T) {
|
func TestParseParameters(t *testing.T) {
|
||||||
testData := []struct {
|
testData := []struct {
|
||||||
rawVars map[string]interface{}
|
rawVars map[string]interface{}
|
||||||
expectVars []map[string]interface{}
|
expectLength int
|
||||||
}{
|
}{
|
||||||
{
|
{
|
||||||
map[string]interface{}{
|
map[string]interface{}{
|
||||||
"username-password": "${parameterize(examples/account.csv)}",
|
"username-password": "${parameterize(examples/account.csv)}",
|
||||||
"user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}},
|
"user_agent": []interface{}{"IOS/10.1", "IOS/10.2"}},
|
||||||
[]map[string]interface{}{
|
6,
|
||||||
{"username": "test1", "password": "111111", "user_agent": "IOS/10.1"},
|
|
||||||
{"username": "test1", "password": "111111", "user_agent": "IOS/10.2"},
|
|
||||||
{"username": "test2", "password": "222222", "user_agent": "IOS/10.1"},
|
|
||||||
{"username": "test2", "password": "222222", "user_agent": "IOS/10.2"},
|
|
||||||
{"username": "test3", "password": "333333", "user_agent": "IOS/10.1"},
|
|
||||||
{"username": "test3", "password": "333333", "user_agent": "IOS/10.2"}},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
map[string]interface{}{
|
map[string]interface{}{
|
||||||
"username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}},
|
"username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}},
|
||||||
"user_agent": []interface{}{"IOS/10.1", "IOS/10.2"},
|
"user_agent": []interface{}{"IOS/10.1", "IOS/10.2"},
|
||||||
"app_version": []interface{}{0.3}},
|
"app_version": []interface{}{0.3}},
|
||||||
[]map[string]interface{}{
|
6,
|
||||||
{"username": "test1", "password": "111111", "user_agent": "IOS/10.1", "app_version": 0.3},
|
|
||||||
{"username": "test1", "password": "111111", "user_agent": "IOS/10.2", "app_version": 0.3},
|
|
||||||
{"username": "test2", "password": "222222", "user_agent": "IOS/10.1", "app_version": 0.3},
|
|
||||||
{"username": "test2", "password": "222222", "user_agent": "IOS/10.2", "app_version": 0.3},
|
|
||||||
{"username": "test3", "password": "333333", "user_agent": "IOS/10.1", "app_version": 0.3},
|
|
||||||
{"username": "test3", "password": "333333", "user_agent": "IOS/10.2", "app_version": 0.3}},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
map[string]interface{}{}, nil,
|
map[string]interface{}{
|
||||||
|
"username-password": [][]interface{}{{"test1", "111111"}, {"test2", "222222"}, {"test3", "333333"}},
|
||||||
|
"user_agent": []interface{}{"IOS/10.1", "IOS/10.2"},
|
||||||
|
"app_version": []interface{}{0.3, 0.4, 0.5}},
|
||||||
|
18,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
nil, nil,
|
map[string]interface{}{}, 0,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
nil, 0,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
for _, data := range testData {
|
for _, data := range testData {
|
||||||
value, _ := parseParameters(data.rawVars, map[string]interface{}{})
|
params, _ := parseParameters(data.rawVars, map[string]interface{}{})
|
||||||
if !assert.Equal(t, data.expectVars, value) {
|
value := genCartesianProduct(params)
|
||||||
|
if !assert.Len(t, value, data.expectLength) {
|
||||||
t.Fail()
|
t.Fail()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -691,3 +687,64 @@ func TestParseParametersError(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestParseSlice(t *testing.T) {
|
||||||
|
testData := []struct {
|
||||||
|
rawVar1 string
|
||||||
|
rawVar2 interface{}
|
||||||
|
expect []map[string]interface{}
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"username-password",
|
||||||
|
[]map[string]interface{}{{"username": "test1", "password": 111111, "other": "111"}, {"username": "test2", "password": 222222, "other": "222"}},
|
||||||
|
[]map[string]interface{}{
|
||||||
|
{"username": "test1", "password": 111111},
|
||||||
|
{"username": "test2", "password": 222222},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"username-password",
|
||||||
|
[][]string{{"test1", "111111"}, {"test2", "222222"}},
|
||||||
|
[]map[string]interface{}{
|
||||||
|
{"username": "test1", "password": "111111"},
|
||||||
|
{"username": "test2", "password": "222222"},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"app_version",
|
||||||
|
[]float64{3.1, 3.0},
|
||||||
|
[]map[string]interface{}{
|
||||||
|
{"app_version": 3.1},
|
||||||
|
{"app_version": 3.0},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, data := range testData {
|
||||||
|
value, _ := parseSlice(data.rawVar1, data.rawVar2)
|
||||||
|
if !assert.Equal(t, data.expect, value) {
|
||||||
|
t.Fail()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestParseSliceError(t *testing.T) {
|
||||||
|
testData := []struct {
|
||||||
|
rawVar1 string
|
||||||
|
rawVar2 interface{}
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
"app_version",
|
||||||
|
123,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"app_version",
|
||||||
|
"123",
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, data := range testData {
|
||||||
|
_, err := parseSlice(data.rawVar1, data.rawVar2)
|
||||||
|
if !assert.Error(t, err) {
|
||||||
|
t.Fail()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -42,30 +42,14 @@ func NewRunner(t *testing.T) *hrpRunner {
|
|||||||
},
|
},
|
||||||
Timeout: 30 * time.Second,
|
Timeout: 30 * time.Second,
|
||||||
},
|
},
|
||||||
sessionVariables: make(map[string]interface{}),
|
|
||||||
transactions: make(map[string]map[TransactionType]time.Time),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
type hrpRunner struct {
|
type hrpRunner struct {
|
||||||
t *testing.T
|
t *testing.T
|
||||||
failfast bool
|
failfast bool
|
||||||
debug bool
|
debug bool
|
||||||
client *http.Client
|
client *http.Client
|
||||||
sessionVariables map[string]interface{}
|
|
||||||
// transactions stores transaction timing info.
|
|
||||||
// key is transaction name, value is map of transaction type and time, e.g. start time and end time.
|
|
||||||
transactions map[string]map[TransactionType]time.Time
|
|
||||||
startTime time.Time // record start time of the testcase
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reset clears runner session variables.
|
|
||||||
func (r *hrpRunner) Reset() *hrpRunner {
|
|
||||||
log.Info().Msg("[init] Reset session variables")
|
|
||||||
r.sessionVariables = make(map[string]interface{})
|
|
||||||
r.transactions = make(map[string]map[TransactionType]time.Time)
|
|
||||||
r.startTime = time.Now()
|
|
||||||
return r
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// SetFailfast configures whether to stop running when one step fails.
|
// SetFailfast configures whether to stop running when one step fails.
|
||||||
@@ -108,43 +92,80 @@ func (r *hrpRunner) Run(testcases ...ITestCase) error {
|
|||||||
// report execution timing event
|
// report execution timing event
|
||||||
defer ga.SendEvent(event.StartTiming("execution"))
|
defer ga.SendEvent(event.StartTiming("execution"))
|
||||||
|
|
||||||
r.Reset()
|
|
||||||
for _, iTestCase := range testcases {
|
for _, iTestCase := range testcases {
|
||||||
testcase, err := iTestCase.ToTestCase()
|
testcase, err := iTestCase.ToTestCase()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Err(err).Msg("[Run] convert ITestCase interface to TestCase struct failed")
|
log.Error().Err(err).Msg("[Run] convert ITestCase interface to TestCase struct failed")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if err := r.runCase(testcase); err != nil {
|
cfg := testcase.Config.ToStruct()
|
||||||
log.Error().Err(err).Msg("[Run] run testcase failed")
|
// parse config parameters
|
||||||
|
err = initParameterIterator(cfg, "runner")
|
||||||
|
if err != nil {
|
||||||
|
log.Error().Interface("parameters", cfg.Parameters).Err(err).Msg("parse config parameters failed")
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
// 在runner模式下,指定整体策略,cfg.ParametersSetting.Iterators仅包含一个CartesianProduct的迭代器
|
||||||
|
for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); {
|
||||||
|
// iterate through all parameter iterators and update case variables
|
||||||
|
for _, it := range cfg.ParametersSetting.Iterators {
|
||||||
|
if it.HasNext() {
|
||||||
|
cfg.Variables = mergeVariables(it.Next(), cfg.Variables)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := r.newCaseRunner(testcase).run(); err != nil {
|
||||||
|
log.Error().Err(err).Msg("[Run] run testcase failed")
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runCase(testcase *TestCase) error {
|
func (r *hrpRunner) newCaseRunner(testcase *TestCase) *caseRunner {
|
||||||
config := testcase.Config
|
caseRunner := &caseRunner{
|
||||||
|
TestCase: testcase,
|
||||||
|
hrpRunner: r,
|
||||||
|
}
|
||||||
|
caseRunner.reset()
|
||||||
|
return caseRunner
|
||||||
|
}
|
||||||
|
|
||||||
|
// caseRunner is used to run testcase and its steps.
|
||||||
|
// each testcase has its own caseRunner instance and share session variables.
|
||||||
|
type caseRunner struct {
|
||||||
|
*TestCase
|
||||||
|
hrpRunner *hrpRunner
|
||||||
|
sessionVariables map[string]interface{}
|
||||||
|
// transactions stores transaction timing info.
|
||||||
|
// key is transaction name, value is map of transaction type and time, e.g. start time and end time.
|
||||||
|
transactions map[string]map[transactionType]time.Time
|
||||||
|
startTime time.Time // record start time of the testcase
|
||||||
|
}
|
||||||
|
|
||||||
|
// reset clears runner session variables.
|
||||||
|
func (r *caseRunner) reset() *caseRunner {
|
||||||
|
log.Info().Msg("[init] Reset session variables")
|
||||||
|
r.sessionVariables = make(map[string]interface{})
|
||||||
|
r.transactions = make(map[string]map[transactionType]time.Time)
|
||||||
|
r.startTime = time.Now()
|
||||||
|
return r
|
||||||
|
}
|
||||||
|
|
||||||
|
func (r *caseRunner) run() error {
|
||||||
|
config := r.TestCase.Config
|
||||||
if err := r.parseConfig(config); err != nil {
|
if err := r.parseConfig(config); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
cfg := config.ToStruct()
|
cfg := config.ToStruct()
|
||||||
log.Info().Str("testcase", config.Name()).Msg("run testcase start")
|
log.Info().Str("testcase", config.Name()).Msg("run testcase start")
|
||||||
parameters := getParameters(config)
|
|
||||||
if parameters == nil {
|
r.startTime = time.Now()
|
||||||
parameters = []map[string]interface{}{{}}
|
for index := range r.TestCase.TestSteps {
|
||||||
}
|
_, err := r.runStep(index, cfg)
|
||||||
for _, parameter := range parameters {
|
if err != nil {
|
||||||
cfg.Variables = mergeVariables(parameter, cfg.Variables)
|
if r.hrpRunner.failfast {
|
||||||
r.startTime = time.Now()
|
return errors.Wrap(err, "abort running due to failfast setting")
|
||||||
for _, step := range testcase.TestSteps {
|
|
||||||
_, err := r.runStep(step, config)
|
|
||||||
if err != nil {
|
|
||||||
if r.failfast {
|
|
||||||
log.Error().Err(err).Msg("abort running due to failfast setting")
|
|
||||||
return err
|
|
||||||
}
|
|
||||||
log.Warn().Err(err).Msg("run step failed, continue next step")
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -153,7 +174,9 @@ func (r *hrpRunner) runCase(testcase *TestCase) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runStep(step IStep, config IConfig) (stepResult *stepData, err error) {
|
func (r *caseRunner) runStep(index int, caseConfig *TConfig) (stepResult *stepData, err error) {
|
||||||
|
step := r.TestCase.TestSteps[index]
|
||||||
|
|
||||||
// step type priority order: transaction > rendezvous > testcase > request
|
// step type priority order: transaction > rendezvous > testcase > request
|
||||||
if stepTran, ok := step.(*StepTransaction); ok {
|
if stepTran, ok := step.(*StepTransaction); ok {
|
||||||
// transaction step
|
// transaction step
|
||||||
@@ -171,23 +194,18 @@ func (r *hrpRunner) runStep(step IStep, config IConfig) (stepResult *stepData, e
|
|||||||
log.Error().Err(err).Msg("copy step data failed")
|
log.Error().Err(err).Msg("copy step data failed")
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
copiedConfig := &TConfig{}
|
|
||||||
if err = copier.Copy(copiedConfig, config.ToStruct()); err != nil {
|
|
||||||
log.Error().Err(err).Msg("copy config data failed")
|
|
||||||
return nil, err
|
|
||||||
}
|
|
||||||
|
|
||||||
stepVariables := copiedStep.Variables
|
stepVariables := copiedStep.Variables
|
||||||
// override variables
|
// override variables
|
||||||
// step variables > session variables (extracted variables from previous steps)
|
// step variables > session variables (extracted variables from previous steps)
|
||||||
stepVariables = mergeVariables(stepVariables, r.sessionVariables)
|
stepVariables = mergeVariables(stepVariables, r.sessionVariables)
|
||||||
// step variables > testcase config variables
|
// step variables > testcase config variables
|
||||||
stepVariables = mergeVariables(stepVariables, copiedConfig.Variables)
|
stepVariables = mergeVariables(stepVariables, caseConfig.Variables)
|
||||||
|
|
||||||
// parse step variables
|
// parse step variables
|
||||||
parsedVariables, err := parseVariables(stepVariables)
|
parsedVariables, err := parseVariables(stepVariables)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Interface("variables", copiedConfig.Variables).Err(err).Msg("parse step variables failed")
|
log.Error().Interface("variables", caseConfig.Variables).Err(err).Msg("parse step variables failed")
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
copiedStep.Variables = parsedVariables // avoid data racing
|
copiedStep.Variables = parsedVariables // avoid data racing
|
||||||
@@ -204,7 +222,7 @@ func (r *hrpRunner) runStep(step IStep, config IConfig) (stepResult *stepData, e
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// run request
|
// run request
|
||||||
copiedStep.Request.URL = buildURL(copiedConfig.BaseURL, copiedStep.Request.URL) // avoid data racing
|
copiedStep.Request.URL = buildURL(caseConfig.BaseURL, copiedStep.Request.URL) // avoid data racing
|
||||||
stepResult, err = r.runStepRequest(copiedStep)
|
stepResult, err = r.runStepRequest(copiedStep)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Error().Err(err).Msg("run request step failed")
|
log.Error().Err(err).Msg("run request step failed")
|
||||||
@@ -225,7 +243,7 @@ func (r *hrpRunner) runStep(step IStep, config IConfig) (stepResult *stepData, e
|
|||||||
return stepResult, nil
|
return stepResult, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runStepTransaction(transaction *Transaction) (stepResult *stepData, err error) {
|
func (r *caseRunner) runStepTransaction(transaction *Transaction) (stepResult *stepData, err error) {
|
||||||
log.Info().
|
log.Info().
|
||||||
Str("name", transaction.Name).
|
Str("name", transaction.Name).
|
||||||
Str("type", string(transaction.Type)).
|
Str("type", string(transaction.Type)).
|
||||||
@@ -241,25 +259,25 @@ func (r *hrpRunner) runStepTransaction(transaction *Transaction) (stepResult *st
|
|||||||
|
|
||||||
// create transaction if not exists
|
// create transaction if not exists
|
||||||
if _, ok := r.transactions[transaction.Name]; !ok {
|
if _, ok := r.transactions[transaction.Name]; !ok {
|
||||||
r.transactions[transaction.Name] = make(map[TransactionType]time.Time)
|
r.transactions[transaction.Name] = make(map[transactionType]time.Time)
|
||||||
}
|
}
|
||||||
|
|
||||||
// record transaction start time, override if already exists
|
// record transaction start time, override if already exists
|
||||||
if transaction.Type == TransactionStart {
|
if transaction.Type == transactionStart {
|
||||||
r.transactions[transaction.Name][TransactionStart] = time.Now()
|
r.transactions[transaction.Name][transactionStart] = time.Now()
|
||||||
}
|
}
|
||||||
// record transaction end time, override if already exists
|
// record transaction end time, override if already exists
|
||||||
if transaction.Type == TransactionEnd {
|
if transaction.Type == transactionEnd {
|
||||||
r.transactions[transaction.Name][TransactionEnd] = time.Now()
|
r.transactions[transaction.Name][transactionEnd] = time.Now()
|
||||||
|
|
||||||
// if transaction start time not exists, use testcase start time instead
|
// if transaction start time not exists, use testcase start time instead
|
||||||
if _, ok := r.transactions[transaction.Name][TransactionStart]; !ok {
|
if _, ok := r.transactions[transaction.Name][transactionStart]; !ok {
|
||||||
r.transactions[transaction.Name][TransactionStart] = r.startTime
|
r.transactions[transaction.Name][transactionStart] = r.startTime
|
||||||
}
|
}
|
||||||
|
|
||||||
// calculate transaction duration
|
// calculate transaction duration
|
||||||
duration := r.transactions[transaction.Name][TransactionEnd].Sub(
|
duration := r.transactions[transaction.Name][transactionEnd].Sub(
|
||||||
r.transactions[transaction.Name][TransactionStart])
|
r.transactions[transaction.Name][transactionStart])
|
||||||
stepResult.elapsed = duration.Milliseconds()
|
stepResult.elapsed = duration.Milliseconds()
|
||||||
log.Info().Str("name", transaction.Name).Dur("elapsed", duration).Msg("transaction")
|
log.Info().Str("name", transaction.Name).Dur("elapsed", duration).Msg("transaction")
|
||||||
}
|
}
|
||||||
@@ -267,7 +285,7 @@ func (r *hrpRunner) runStepTransaction(transaction *Transaction) (stepResult *st
|
|||||||
return stepResult, nil
|
return stepResult, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runStepRendezvous(rend *Rendezvous) (stepResult *stepData, err error) {
|
func (r *caseRunner) runStepRendezvous(rend *Rendezvous) (stepResult *stepData, err error) {
|
||||||
log.Info().
|
log.Info().
|
||||||
Str("name", rend.Name).
|
Str("name", rend.Name).
|
||||||
Float32("percent", rend.Percent).
|
Float32("percent", rend.Percent).
|
||||||
@@ -282,7 +300,7 @@ func (r *hrpRunner) runStepRendezvous(rend *Rendezvous) (stepResult *stepData, e
|
|||||||
return stepResult, nil
|
return stepResult, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error) {
|
func (r *caseRunner) runStepRequest(step *TStep) (stepResult *stepData, err error) {
|
||||||
stepResult = &stepData{
|
stepResult = &stepData{
|
||||||
name: step.Name,
|
name: step.Name,
|
||||||
stepType: stepTypeRequest,
|
stepType: stepTypeRequest,
|
||||||
@@ -395,7 +413,7 @@ func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error
|
|||||||
req.Host = u.Host
|
req.Host = u.Host
|
||||||
|
|
||||||
// log & print request
|
// log & print request
|
||||||
if r.debug {
|
if r.hrpRunner.debug {
|
||||||
reqDump, err := httputil.DumpRequest(req, true)
|
reqDump, err := httputil.DumpRequest(req, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "dump request failed")
|
return nil, errors.Wrap(err, "dump request failed")
|
||||||
@@ -406,7 +424,7 @@ func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error
|
|||||||
|
|
||||||
// do request action
|
// do request action
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
resp, err := r.client.Do(req)
|
resp, err := r.hrpRunner.client.Do(req)
|
||||||
stepResult.elapsed = time.Since(start).Milliseconds()
|
stepResult.elapsed = time.Since(start).Milliseconds()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, errors.Wrap(err, "do request failed")
|
return nil, errors.Wrap(err, "do request failed")
|
||||||
@@ -414,7 +432,7 @@ func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error
|
|||||||
defer resp.Body.Close()
|
defer resp.Body.Close()
|
||||||
|
|
||||||
// log & print response
|
// log & print response
|
||||||
if r.debug {
|
if r.hrpRunner.debug {
|
||||||
fmt.Println("==================== response ===================")
|
fmt.Println("==================== response ===================")
|
||||||
respDump, err := httputil.DumpResponse(resp, true)
|
respDump, err := httputil.DumpResponse(resp, true)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -425,7 +443,7 @@ func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error
|
|||||||
}
|
}
|
||||||
|
|
||||||
// new response object
|
// new response object
|
||||||
respObj, err := newResponseObject(r.t, resp)
|
respObj, err := newResponseObject(r.hrpRunner.t, resp)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
err = errors.Wrap(err, "init ResponseObject error")
|
err = errors.Wrap(err, "init ResponseObject error")
|
||||||
return
|
return
|
||||||
@@ -450,7 +468,7 @@ func (r *hrpRunner) runStepRequest(step *TStep) (stepResult *stepData, err error
|
|||||||
return stepResult, nil
|
return stepResult, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) runStepTestCase(step *TStep) (stepResult *stepData, err error) {
|
func (r *caseRunner) runStepTestCase(step *TStep) (stepResult *stepData, err error) {
|
||||||
stepResult = &stepData{
|
stepResult = &stepData{
|
||||||
name: step.Name,
|
name: step.Name,
|
||||||
stepType: stepTypeTestCase,
|
stepType: stepTypeTestCase,
|
||||||
@@ -458,7 +476,7 @@ func (r *hrpRunner) runStepTestCase(step *TStep) (stepResult *stepData, err erro
|
|||||||
}
|
}
|
||||||
testcase := step.TestCase
|
testcase := step.TestCase
|
||||||
start := time.Now()
|
start := time.Now()
|
||||||
err = r.runCase(testcase)
|
err = r.hrpRunner.newCaseRunner(testcase).run()
|
||||||
stepResult.elapsed = time.Since(start).Milliseconds()
|
stepResult.elapsed = time.Since(start).Milliseconds()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return stepResult, err
|
return stepResult, err
|
||||||
@@ -467,7 +485,7 @@ func (r *hrpRunner) runStepTestCase(step *TStep) (stepResult *stepData, err erro
|
|||||||
return stepResult, nil
|
return stepResult, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) parseConfig(config IConfig) error {
|
func (r *caseRunner) parseConfig(config IConfig) error {
|
||||||
cfg := config.ToStruct()
|
cfg := config.ToStruct()
|
||||||
// parse config variables
|
// parse config variables
|
||||||
parsedVariables, err := parseVariables(cfg.Variables)
|
parsedVariables, err := parseVariables(cfg.Variables)
|
||||||
@@ -493,7 +511,7 @@ func (r *hrpRunner) parseConfig(config IConfig) error {
|
|||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (r *hrpRunner) getSummary() *testCaseSummary {
|
func (r *caseRunner) getSummary() *testCaseSummary {
|
||||||
return &testCaseSummary{}
|
return &testCaseSummary{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ func (s *StepRequest) CallRefCase(tc *TestCase) *StepTestCaseWithOptionalArgs {
|
|||||||
func (s *StepRequest) StartTransaction(name string) *StepTransaction {
|
func (s *StepRequest) StartTransaction(name string) *StepTransaction {
|
||||||
s.step.Transaction = &Transaction{
|
s.step.Transaction = &Transaction{
|
||||||
Name: name,
|
Name: name,
|
||||||
Type: TransactionStart,
|
Type: transactionStart,
|
||||||
}
|
}
|
||||||
return &StepTransaction{
|
return &StepTransaction{
|
||||||
step: s.step,
|
step: s.step,
|
||||||
@@ -189,7 +189,7 @@ func (s *StepRequest) StartTransaction(name string) *StepTransaction {
|
|||||||
func (s *StepRequest) EndTransaction(name string) *StepTransaction {
|
func (s *StepRequest) EndTransaction(name string) *StepTransaction {
|
||||||
s.step.Transaction = &Transaction{
|
s.step.Transaction = &Transaction{
|
||||||
Name: name,
|
Name: name,
|
||||||
Type: TransactionEnd,
|
Type: transactionEnd,
|
||||||
}
|
}
|
||||||
return &StepTransaction{
|
return &StepTransaction{
|
||||||
step: s.step,
|
step: s.step,
|
||||||
|
|||||||
+7
-4
@@ -74,12 +74,15 @@ func TestRunRequestPostDataToStruct(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestRunRequestRun(t *testing.T) {
|
func TestRunRequestRun(t *testing.T) {
|
||||||
config := NewConfig("test").SetBaseURL("https://postman-echo.com")
|
testcase := &TestCase{
|
||||||
runner := NewRunner(t).SetDebug(true)
|
Config: NewConfig("test").SetBaseURL("https://postman-echo.com"),
|
||||||
if _, err := runner.runStep(stepGET, config); err != nil {
|
TestSteps: []IStep{stepGET, stepPOSTData},
|
||||||
|
}
|
||||||
|
runner := NewRunner(t).SetDebug(true).newCaseRunner(testcase)
|
||||||
|
if _, err := runner.runStep(0, testcase.Config.ToStruct()); err != nil {
|
||||||
t.Fatalf("tStep.Run() error: %s", err)
|
t.Fatalf("tStep.Run() error: %s", err)
|
||||||
}
|
}
|
||||||
if _, err := runner.runStep(stepPOSTData, config); err != nil {
|
if _, err := runner.runStep(1, testcase.Config.ToStruct()); err != nil {
|
||||||
t.Fatalf("tStepPOSTData.Run() error: %s", err)
|
t.Fatalf("tStepPOSTData.Run() error: %s", err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user