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

Merge pull request #1345 from xucong053/bugfix

Browse Source 
fix: failed to load overall pick_order strategy in parameters_setting
This commit is contained in:
bbx-winner
2022-06-08 17:42:12 +08:00
committed by GitHub
parent da5fa1c88c 46a3149654
commit ccdd2090f6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/hrp/parameters_test.json
View File

@@ -9,14 +9,14 @@
"username-password": "${parameterize($file)}" "username-password": "${parameterize($file)}"
}, },
"parameters_setting": { "parameters_setting": {
"pick_order": "random",
"strategies": { "strategies": {
"user_agent": { "user_agent": {
"name": "user-identity", "name": "user-identity",
"pick_order": "sequential" "pick_order": "sequential"
}, },
"username-password": { "username-password": {
"name": "user-info", "name": "user-info"
"pick_order": "random"
} }
}, },
"limit": 6 "limit": 6

2
examples/hrp/parameters_test.yaml
View File

@@ -4,13 +4,13 @@ config:
user_agent: [ "iOS/10.1", "iOS/10.2" ] user_agent: [ "iOS/10.1", "iOS/10.2" ]
username-password: ${parameterize($file)} username-password: ${parameterize($file)}
parameters_setting: parameters_setting:
pick_order: "random"
strategies: strategies:
user_agent: user_agent:
name: "user-identity" name: "user-identity"
pick_order: "sequential" pick_order: "sequential"
username-password: username-password:
name: "user-info" name: "user-info"
pick_order: "random"
limit: 6 limit: 6
variables: variables:
app_version: v1 app_version: v1

4
hrp/parameters.go
View File

@@ -12,7 +12,7 @@ import (
) )
type TParamsConfig struct { type TParamsConfig struct {
PickOrder iteratorPickOrder `json:"strategy,omitempty" yaml:"strategy,omitempty"` // overall pick-order strategy PickOrder iteratorPickOrder `json:"pick_order,omitempty" yaml:"pick_order,omitempty"` // overall pick-order strategy
Strategies map[string]iteratorStrategy `json:"strategies,omitempty" yaml:"strategies,omitempty"` // individual strategies for each parameters Strategies map[string]iteratorStrategy `json:"strategies,omitempty" yaml:"strategies,omitempty"` // individual strategies for each parameters
Limit int `json:"limit,omitempty" yaml:"limit,omitempty"` Limit int `json:"limit,omitempty" yaml:"limit,omitempty"`
} }
@@ -69,7 +69,7 @@ func newParametersIterator(parameters map[string]Parameters, config *TParamsConf
for paramName := range parameters { for paramName := range parameters {
// check parameter individual pick order strategy // check parameter individual pick order strategy
strategy, ok := config.Strategies[paramName] strategy, ok := config.Strategies[paramName]
if !ok { if !ok || strategy.PickOrder == "" {
// default to overall pick order strategy // default to overall pick order strategy
strategy.PickOrder = config.PickOrder strategy.PickOrder = config.PickOrder
} }