mirror of
https://github.com/httprunner/httprunner.git
synced 2026-05-10 17:43:00 +08:00
fix: failed to load overall pick_order strategy in parameters_setting
This commit is contained in:
@@ -9,14 +9,14 @@
|
||||
"username-password": "${parameterize($file)}"
|
||||
},
|
||||
"parameters_setting": {
|
||||
"pick_order": "random",
|
||||
"strategies": {
|
||||
"user_agent": {
|
||||
"name": "user-identity",
|
||||
"pick_order": "sequential"
|
||||
},
|
||||
"username-password": {
|
||||
"name": "user-info",
|
||||
"pick_order": "random"
|
||||
"name": "user-info"
|
||||
}
|
||||
},
|
||||
"limit": 6
|
||||
|
||||
@@ -4,13 +4,13 @@ config:
|
||||
user_agent: [ "iOS/10.1", "iOS/10.2" ]
|
||||
username-password: ${parameterize($file)}
|
||||
parameters_setting:
|
||||
pick_order: "random"
|
||||
strategies:
|
||||
user_agent:
|
||||
name: "user-identity"
|
||||
pick_order: "sequential"
|
||||
username-password:
|
||||
name: "user-info"
|
||||
pick_order: "random"
|
||||
limit: 6
|
||||
variables:
|
||||
app_version: v1
|
||||
|
||||
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
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
|
||||
Limit int `json:"limit,omitempty" yaml:"limit,omitempty"`
|
||||
}
|
||||
@@ -69,7 +69,7 @@ func newParametersIterator(parameters map[string]Parameters, config *TParamsConf
|
||||
for paramName := range parameters {
|
||||
// check parameter individual pick order strategy
|
||||
strategy, ok := config.Strategies[paramName]
|
||||
if !ok {
|
||||
if !ok || strategy.PickOrder == "" {
|
||||
// default to overall pick order strategy
|
||||
strategy.PickOrder = config.PickOrder
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user