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

avoid data race.

Browse Source
This commit is contained in:
徐聪
2022-01-19 21:09:14 +08:00
parent 59ef894444
commit 238f49d65d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
boomer.go
View File

@@ -108,8 +108,7 @@ func (b *HRPBoomer) convertBoomerTask(testcase *TestCase) *boomer.Task {
} }
} }
config := runner.TestCase.Config if err := runner.parseConfig(caseConfig); err != nil {
if err := runner.parseConfig(config); err != nil {
log.Error().Err(err).Msg("parse config failed") log.Error().Err(err).Msg("parse config failed")
return return
} }

12
runner.go
View File

@@ -160,10 +160,10 @@ func (r *caseRunner) reset() *caseRunner {
func (r *caseRunner) run() error { func (r *caseRunner) run() error {
config := r.TestCase.Config config := r.TestCase.Config
cfg := config.ToStruct()
// init plugin // init plugin
var err error var err error
if r.parser.plugin, err = initPlugin(config.ToStruct().Path); err != nil { if r.parser.plugin, err = initPlugin(cfg.Path); err != nil {
return err return err
} }
defer func() { defer func() {
@@ -171,11 +171,9 @@ func (r *caseRunner) run() error {
r.parser.plugin.Quit() r.parser.plugin.Quit()
} }
}() }()
if err := r.parseConfig(cfg); err != nil {
if err := r.parseConfig(config); err != nil {
return err return err
} }
cfg := config.ToStruct()
log.Info().Str("testcase", config.Name()).Msg("run testcase start") log.Info().Str("testcase", config.Name()).Msg("run testcase start")
r.startTime = time.Now() r.startTime = time.Now()
@@ -545,9 +543,7 @@ func (r *caseRunner) runStepTestCase(step *TStep) (stepResult *stepData, err err
return stepResult, nil return stepResult, nil
} }
func (r *caseRunner) parseConfig(config IConfig) error { func (r *caseRunner) parseConfig(cfg *TConfig) error {
cfg := config.ToStruct()
// parse config variables // parse config variables
parsedVariables, err := r.parser.parseVariables(cfg.Variables) parsedVariables, err := r.parser.parseVariables(cfg.Variables)
if err != nil { if err != nil {