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

refactor: initParameterIterator

Browse Source
This commit is contained in:
debugtalk
2022-04-13 15:25:13 +08:00
parent 27ba5e0da5
commit d7348a0063
3 changed files with 24 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hrp/runner.go
View File

@@ -152,26 +152,22 @@ func (r *HRPRunner) Run(testcases ...ITestCase) error {
// run testcase one by one
for _, testcase := range testCases {
// each testcase has its own session runner
sessionRunner, err := r.NewSessionRunner(testcase)
if err != nil {
log.Error().Err(err).Msg("[Run] init session runner failed")
return err
}
defer sessionRunner.parser.plugin.Quit()
defer func() {
if sessionRunner.parser.plugin != nil {
sessionRunner.parser.plugin.Quit()
}
}()
cfg := testcase.Config
// 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
}
// 在runner模式下，指定整体策略，cfg.ParametersSetting.Iterators仅包含一个CartesianProduct的迭代器
for it := cfg.ParametersSetting.Iterators[0]; it.HasNext(); {
for it := sessionRunner.parsedConfig.ParametersSetting.Iterators[0]; it.HasNext(); {
var parameterVariables map[string]interface{}
// iterate through all parameter iterators and update case variables
for _, it := range cfg.ParametersSetting.Iterators {
for _, it := range sessionRunner.parsedConfig.ParametersSetting.Iterators {
if it.HasNext() {
parameterVariables = it.Next()
}
@@ -210,6 +206,8 @@ func (r *HRPRunner) Run(testcases ...ITestCase) error {
return nil
}
// NewSessionRunner creates a new session runner for testcase.
// each testcase has its own session runner
func (r *HRPRunner) NewSessionRunner(testcase *TestCase) (*SessionRunner, error) {
sessionRunner := &SessionRunner{
testCase: testcase,
@@ -230,5 +228,12 @@ func (r *HRPRunner) NewSessionRunner(testcase *TestCase) (*SessionRunner, error)
return nil, errors.Wrap(err, "parse testcase config failed")
}
// parse testcase config parameters
err = initParameterIterator(sessionRunner.parsedConfig, "runner")
if err != nil {
log.Error().Interface("parameters", sessionRunner.parsedConfig.Parameters).Err(err).Msg("parse config parameters failed")
return nil, errors.Wrap(err, "parse testcase config parameters failed")
}
return sessionRunner, nil
}